commit dd2b2b61259daced80658540006d3a36ad401994
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jun 07 22:03:29 2022 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Tue Jun 07 22:03:29 2022 +0200
tree 4756992450caaf57cefcb5b5ffce07bf41e34f54
parent 85166b97becb5cb4bc1e8e033dc6a76bb659d816

Update D8 and R8 to 4.0.9-dev

Version: 4.0.9-dev
This build IS NOT suitable for preview or public release.

Built here: go/r8-releases/raw/4.0.9-dev

Test: TARGET_PRODUCT=aosp_arm64 m -j core-oj
Change-Id: I4c28109c7bf4952a415758028c959a8a069ab403

r8.jar

diff --git a/r8.jar b/r8.jar
index 8a7b854..dec6e27 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ

r8.jar.map

diff --git a/r8.jar.map b/r8.jar.map
index a5133ee..de8a41d 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,10 +1,10 @@
 # compiler: R8
-# compiler_version: 4.0.7-dev
+# compiler_version: 4.0.9-dev
 # compiler_hash: engineering
 # common_typos_disable
 # {"id":"com.android.tools.r8.mapping","version":"2.0"}
-# pg_map_id: 4.0.7-dev
-# pg_map_hash: SHA-256 1df8adf704d7dfd54fc5403e346ddfa8fab6045321899db87c1aa62b853fa626
+# pg_map_id: 4.0.9-dev
+# pg_map_hash: SHA-256 68131c353a281721e89849c4e63c8d39fbaf875fd6eabec574179bc8bd557d9e
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.o2:
     1:1:void <init>(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):14:14 -> <init>
     1:4:java.lang.String makeMessage(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String,java.lang.String):21:24 -> a
@@ -287,7 +287,7 @@
     492:492:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
     493:493:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
     472:472:com.android.tools.r8.BackportedMethodListCommand$Builder parse(java.lang.String[]):156:156 -> parse
-com.android.tools.r8.BackportedMethodListCommand$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.i4:
+com.android.tools.r8.BackportedMethodListCommand$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.k4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.String com.android.tools.r8.BackportedMethodListCommand$$InternalSyntheticOutline$166$7b25eb1be35d851e67f562f9da6a58cac1f92adedb289ac8c30b03bb2cd9fef7$0.m(java.lang.StringBuilder,java.lang.String,java.lang.String):0:2 -> a
@@ -340,7 +340,7 @@
     1:1:com.android.tools.r8.BackportedMethodListCommand$Builder setOutputPath(java.nio.file.Path):264:264 -> setOutputPath
     1:1:com.android.tools.r8.BackportedMethodListCommand$Builder setPrintHelp(boolean):288:288 -> setPrintHelp
     1:1:com.android.tools.r8.BackportedMethodListCommand$Builder setPrintVersion(boolean):299:299 -> setPrintVersion
-com.android.tools.r8.BackportedMethodListCommand$Builder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.j4:
+com.android.tools.r8.BackportedMethodListCommand$Builder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.l4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.String com.android.tools.r8.BackportedMethodListCommand$Builder$$InternalSyntheticOutline$166$74531d99dd9e8c41302dc64bf7c1ad28bdce38f5e1cbae1669b2746d1cca7f73$0.m(java.lang.String,int):0:4 -> a
@@ -734,7 +734,7 @@
     16:17:com.android.tools.r8.AssertionsConfiguration lambda$addAssertionTransformation$2(com.android.tools.r8.BaseCompilerCommandParser$AssertionTransformationType,com.android.tools.r8.references.MethodReference,java.lang.String,com.android.tools.r8.AssertionsConfiguration$Builder):99:100 -> b
     18:18:int tryParseMapDiagnostics(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,java.lang.String[],int,com.android.tools.r8.origin.Origin):204:204 -> b
     19:19:int tryParseMapDiagnostics(com.android.tools.r8.BaseCompilerCommand$Builder,java.lang.String,java.lang.String[],int,com.android.tools.r8.origin.Origin):203:203 -> b
-com.android.tools.r8.BaseCompilerCommandParser$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.v4:
+com.android.tools.r8.BaseCompilerCommandParser$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.x4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:7:java.lang.String com.android.tools.r8.BaseCompilerCommandParser$$InternalSyntheticOutline$166$146f7b3d6ff8af7ce0bd70dfaecb3106d94f9b5e09cb4e5860f363a40e03fcc0$0.m(java.lang.String,java.lang.String,java.lang.String,java.lang.String):0:6 -> a
@@ -823,118 +823,125 @@
     1:1:com.android.tools.r8.CompilationMode[] values():7:7 -> values
 com.android.tools.r8.D8 -> com.android.tools.r8.D8:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():86:86 -> <clinit>
-    1:4:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):104:107 -> a
-    5:7:void run(java.lang.String[]):129:131 -> a
-    5:7:void lambda$main$2(java.lang.String[]):154 -> a
-    8:16:java.lang.String com.android.tools.r8.D8CommandParser.getUsageMessage():151:159 -> a
-    8:16:void run(java.lang.String[]):131 -> a
-    8:16:void lambda$main$2(java.lang.String[]):154 -> a
-    17:21:void run(java.lang.String[]):131:135 -> a
-    17:21:void lambda$main$2(java.lang.String[]):154 -> a
-    22:22:void lambda$main$2(java.lang.String[]):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":29,"2":30,"3":31}}
-    29:29:void run(java.lang.String[]):135:135 -> a
-    29:29:void lambda$main$2(java.lang.String[]):154 -> a
-    30:30:void run(java.lang.String[]):135:135 -> a
-    30:30:void lambda$main$2(java.lang.String[]):154 -> a
-    31:31:void run(java.lang.String[]):135:135 -> a
-    31:31:void lambda$main$2(java.lang.String[]):154 -> a
-    23:28:void run(java.lang.String[]):135:140 -> a
-    23:28:void lambda$main$2(java.lang.String[]):154 -> a
-    32:33:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):159:160 -> a
-    34:52: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):174:192 -> a
-    53:53:com.android.tools.r8.graph.AppView lambda$readApp$5(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):192:192 -> a
-    54:54:java.lang.Boolean lambda$run$6(com.android.tools.r8.utils.InternalOptions):209:209 -> a
-    55:57:void lambda$run$7(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):232:234 -> a
-    58:58:void lambda$run$8(java.lang.String):264:264 -> a
-    59:80:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):356:377 -> a
-    81:86:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):374:379 -> a
-    87:87:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView):29:29 -> a
-    87:87:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):379 -> a
-    88:105:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):379:396 -> a
-    106:106:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():270:270 -> a
-    106:106:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):396 -> a
-    107:109:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):402:404 -> a
-    110:110:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():521:521 -> a
-    110:110:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):188 -> a
+    1:1:void <clinit>():89:89 -> <clinit>
+    1:1:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection.builder():33:33 -> a
+    1:1:void initializeAssumeInfoCollection(com.android.tools.r8.graph.AppView):353 -> a
+    2:10:void initializeAssumeInfoCollection(com.android.tools.r8.graph.AppView):354:362 -> a
+    11:11:void initializeAssumeInfoCollection(com.android.tools.r8.graph.AppView):361:361 -> a
+    12:12:com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNumberFromIntervalValue(long,long):36:36 -> a
+    12:12:void initializeAssumeInfoCollection(com.android.tools.r8.graph.AppView):361 -> a
+    13:19:void initializeAssumeInfoCollection(com.android.tools.r8.graph.AppView):359:365 -> a
+    20:23:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):107:110 -> a
+    24:26:void run(java.lang.String[]):132:134 -> a
+    24:26:void lambda$main$2(java.lang.String[]):157 -> a
+    27:35:java.lang.String com.android.tools.r8.D8CommandParser.getUsageMessage():151:159 -> a
+    27:35:void run(java.lang.String[]):134 -> a
+    27:35:void lambda$main$2(java.lang.String[]):157 -> a
+    36:40:void run(java.lang.String[]):134:138 -> a
+    36:40:void lambda$main$2(java.lang.String[]):157 -> a
+    41:41:void lambda$main$2(java.lang.String[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":48,"2":49,"3":50}}
+    48:48:void run(java.lang.String[]):138:138 -> a
+    48:48:void lambda$main$2(java.lang.String[]):157 -> a
+    49:49:void run(java.lang.String[]):138:138 -> a
+    49:49:void lambda$main$2(java.lang.String[]):157 -> a
+    50:50:void run(java.lang.String[]):138:138 -> a
+    50:50:void lambda$main$2(java.lang.String[]):157 -> a
+    42:47:void run(java.lang.String[]):138:143 -> a
+    42:47:void lambda$main$2(java.lang.String[]):157 -> a
+    51:52:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):162:163 -> a
+    53:71: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):177:195 -> a
+    72:72:com.android.tools.r8.graph.AppView lambda$readApp$5(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):195:195 -> a
+    73:73:java.lang.Boolean lambda$run$6(com.android.tools.r8.utils.InternalOptions):212:212 -> a
+    74:76:void lambda$run$7(com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis,com.android.tools.r8.graph.DexProgramClass):238:240 -> a
+    77:77:void lambda$run$8(java.lang.String):270:270 -> a
+    78:99:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):378:399 -> a
+    100:105:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):396:401 -> a
+    106:106:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView):29:29 -> a
+    106:106:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):401 -> a
+    107:124:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):401:418 -> a
+    125:125:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():270:270 -> a
+    125:125:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):418 -> a
+    126:128:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):424:426 -> a
+    129:129:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():526:526 -> a
+    129:129:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):191 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    111:111:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():521:521 -> a
-    111:111:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):188 -> a
-    112:114:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):189:191 -> a
-    115:115:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):186:186 -> a
-    1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):124:124 -> b
-    1:4:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):164:167 -> c
-    1:6:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):197:202 -> d
+    130:130:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():526:526 -> a
+    130:130:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):191 -> a
+    131:133:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):192:194 -> a
+    134:134:com.android.tools.r8.graph.AppInfo lambda$readApp$4(com.android.tools.r8.graph.LazyLoadedDexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.dex.ApplicationReader):189:189 -> a
+    1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):127:127 -> b
+    1:4:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):167:170 -> c
+    1:6:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):200:205 -> d
     7:7:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":796,"2":797,"3":798}}
-    796:796:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):202:202 -> d
-    797:797:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):202:202 -> d
-    798:798:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):202:202 -> d
-    209:210:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):202:203 -> d
-    211:211:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":799,"2":800,"3":801}}
-    799:799:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):203:203 -> d
-    800:800:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):203:203 -> d
-    801:801:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):203:203 -> d
-    414:415:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):203:204 -> d
-    416:416:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":802,"2":803,"3":804}}
-    802:802:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):204:204 -> d
-    803:803:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):204:204 -> d
-    804:804:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):204:204 -> d
-    620:625:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):204:209 -> d
-    626:626:boolean com.android.tools.r8.utils.AssertionUtils.forTesting(com.android.tools.r8.utils.InternalOptions,java.util.function.Supplier):17:17 -> d
-    626:626:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):209 -> d
-    627:632:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):209:214 -> d
-    633:637:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):35:39 -> d
-    633:637:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):215 -> d
-    638:638:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):34:34 -> d
-    638:638:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):215 -> d
-    639:653:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):216:230 -> d
-    654:709:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):229:284 -> d
-    710:713:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):23:26 -> d
-    710:713:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):284 -> d
-    714:715:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):284:285 -> d
-    716:723:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.RecordRewritingNamingLens.createRecordRewritingNamingLens(com.android.tools.r8.graph.AppView):24:31 -> d
-    716:723:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):285 -> d
-    724:740:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):285:301 -> d
-    741:757:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):298:314 -> d
-    758:760:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):313:315 -> d
-    761:761:void finalizeApplication(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):348:348 -> d
-    761:761:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):318 -> d
-    762:762:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):320:320 -> d
-    763:763:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):79:79 -> d
-    763:763:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):320 -> d
-    764:764:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):322:322 -> d
-    765:765:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView):29:29 -> d
-    765:765:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):322 -> d
-    766:767:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):322:323 -> d
-    768:768:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> d
-    768:768:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):325 -> d
-    769:769:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):326:326 -> d
-    770:770:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():545:545 -> d
-    770:770:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):326 -> d
-    771:786:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):326:341 -> d
-    787:787:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> d
-    787:787:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):336 -> d
-    788:795:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):336:343 -> d
-    1:5:void main(java.lang.String[]):150:154 -> main
-    6:7:void main(java.lang.String[]):151:152 -> main
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":808,"2":809,"3":810}}
+    808:808:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):205:205 -> d
+    809:809:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):205:205 -> d
+    810:810:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):205:205 -> d
+    212:213:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):205:206 -> d
+    214:214:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":811,"2":812,"3":813}}
+    811:811:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):206:206 -> d
+    812:812:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):206:206 -> d
+    813:813:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):206:206 -> d
+    420:421:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):206:207 -> d
+    422:422:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):0:0 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":814,"2":815,"3":816}}
+    814:814:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):207:207 -> d
+    815:815:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):207:207 -> d
+    816:816:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):207:207 -> d
+    629:634:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):207:212 -> d
+    635:635:boolean com.android.tools.r8.utils.AssertionUtils.forTesting(com.android.tools.r8.utils.InternalOptions,java.util.function.Supplier):17:17 -> d
+    635:635:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):212 -> d
+    636:644:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):212:220 -> d
+    645:649:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):35:39 -> d
+    645:649:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):221 -> d
+    650:650:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):34:34 -> d
+    650:650:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):221 -> d
+    651:665:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):222:236 -> d
+    666:721:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):235:290 -> d
+    722:725:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):23:26 -> d
+    722:725:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):290 -> d
+    726:727:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):290:291 -> d
+    728:735:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.RecordRewritingNamingLens.createRecordRewritingNamingLens(com.android.tools.r8.graph.AppView):24:31 -> d
+    728:735:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):291 -> d
+    736:752:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):291:307 -> d
+    753:769:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):304:320 -> d
+    770:772:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):319:321 -> d
+    773:773:void finalizeApplication(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):370:370 -> d
+    773:773:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):324 -> d
+    774:774:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):326:326 -> d
+    775:775:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):79:79 -> d
+    775:775:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):326 -> d
+    776:776:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):328:328 -> d
+    777:777:void com.android.tools.r8.naming.signature.GenericSignatureRewriter.<init>(com.android.tools.r8.graph.AppView):29:29 -> d
+    777:777:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):328 -> d
+    778:779:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):328:329 -> d
+    780:780:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> d
+    780:780:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):331 -> d
+    781:781:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):332:332 -> d
+    782:782:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():550:550 -> d
+    782:782:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):332 -> d
+    783:798:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):332:347 -> d
+    799:799:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> d
+    799:799:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):342 -> d
+    800:807:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):342:349 -> d
+    1:5:void main(java.lang.String[]):153:157 -> main
+    6:7:void main(java.lang.String[]):154:155 -> main
     8:16:java.lang.String com.android.tools.r8.D8CommandParser.getUsageMessage():151:159 -> main
-    8:16:void main(java.lang.String[]):152 -> main
-    17:17:void main(java.lang.String[]):152:152 -> main
-    1:5:void run(com.android.tools.r8.D8Command):97:101 -> run
-    6:6:void run(com.android.tools.r8.D8Command):100:100 -> run
-    7:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):119:122 -> run
-    11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):121:121 -> run
+    8:16:void main(java.lang.String[]):155 -> main
+    17:17:void main(java.lang.String[]):155:155 -> main
+    1:5:void run(com.android.tools.r8.D8Command):100:104 -> run
+    6:6:void run(com.android.tools.r8.D8Command):103:103 -> run
+    7:10:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):122:125 -> run
+    11:11:void run(com.android.tools.r8.D8Command,java.util.concurrent.ExecutorService):124:124 -> run
 com.android.tools.r8.D8$ConvertedCfFiles -> com.android.tools.r8.k:
     java.util.List resources -> a
-    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
+    1:3:void <init>():441:443 -> <init>
+    1:3:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):449:451 -> accept
+    4:4:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):450:450 -> accept
+    5:5:void accept(int,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):449:449 -> accept
+    1:1:java.util.Collection getProgramResources():456:456 -> getProgramResources
 com.android.tools.r8.D8Command -> com.android.tools.r8.D8Command:
     com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> w
     com.android.tools.r8.graph.DexItemFactory factory -> G
@@ -957,20 +964,20 @@
     33:46:void <init>(boolean,boolean):553:566 -> <init>
     1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):456:456 -> a
     1:4:com.android.tools.r8.utils.InternalOptions getInternalOptions():571:574 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> b
     5:5:com.android.tools.r8.utils.InternalOptions getInternalOptions():575 -> b
     6:14:com.android.tools.r8.utils.InternalOptions getInternalOptions():576:584 -> b
     15:57:com.android.tools.r8.utils.InternalOptions getInternalOptions():583:625 -> b
-    58:58:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1686:1686 -> b
+    58:58:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1662:1662 -> b
     58:58:com.android.tools.r8.utils.InternalOptions getInternalOptions():625 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    59:59:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1687:1687 -> b
+    59:59:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1663:1663 -> b
     59:59:com.android.tools.r8.utils.InternalOptions getInternalOptions():625 -> b
     60:63:com.android.tools.r8.utils.InternalOptions getInternalOptions():629:632 -> b
     64:64:com.android.tools.r8.AssertionsConfiguration$Builder com.android.tools.r8.AssertionsConfiguration.builder(com.android.tools.r8.utils.Reporter):72:72 -> b
     64:64:com.android.tools.r8.utils.InternalOptions getInternalOptions():632 -> b
     65:83:com.android.tools.r8.utils.InternalOptions getInternalOptions():633:651 -> b
-    84:84:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> b
+    84:84:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> b
     84:84:com.android.tools.r8.utils.InternalOptions getInternalOptions():653 -> b
     85:89:com.android.tools.r8.utils.InternalOptions getInternalOptions():653:657 -> b
     90:90:com.android.tools.r8.dump.DumpOptions dumpOptions():664:664 -> b
@@ -1038,7 +1045,7 @@
     1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():284:284 -> g
     1:1:com.android.tools.r8.DesugarGraphConsumer getDesugarGraphConsumer():255:255 -> getDesugarGraphConsumer
     1:12:com.android.tools.r8.D8Command makeCommand():382:393 -> o
-    13:18:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.shaking.ProguardConfigurationParser.parse(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):115:120 -> o
+    13:18:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.shaking.ProguardConfigurationParser.parse(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):111:116 -> o
     13:18:com.android.tools.r8.D8Command makeCommand():393 -> o
     19:30:com.android.tools.r8.D8Command makeCommand():395:406 -> o
     31:31:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():536:536 -> o
@@ -1194,7 +1201,7 @@
     1:6:com.android.tools.r8.DataEntryResource fromString(java.lang.String,com.android.tools.r8.origin.Origin,java.lang.String[]):30:35 -> fromString
     1:1:com.android.tools.r8.DataEntryResource fromZip(java.util.zip.ZipFile,java.util.zip.ZipEntry):44:44 -> fromZip
     1:1:com.android.tools.r8.DataEntryResource withName(java.lang.String):48:48 -> withName
-com.android.tools.r8.DataEntryResource$ByteDataEntryResource -> com.android.tools.r8.internal.Oe:
+com.android.tools.r8.DataEntryResource$ByteDataEntryResource -> com.android.tools.r8.internal.Se:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> c
     java.lang.String name -> b
@@ -1212,7 +1219,7 @@
     1:3:java.io.InputStream getByteStream():134:136 -> getByteStream
     1:1:java.lang.String getName():128:128 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():123:123 -> getOrigin
-com.android.tools.r8.DataEntryResource$NestedDataEntryResource -> com.android.tools.r8.internal.Pe:
+com.android.tools.r8.DataEntryResource$NestedDataEntryResource -> com.android.tools.r8.internal.Te:
     com.android.tools.r8.DataEntryResource resource -> b
     java.lang.String name -> a
     1:4:void <init>(java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.DataEntryResource):150:153 -> <init>
@@ -1245,11 +1252,11 @@
     42:42:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):221:221 -> a
     42:42:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):109 -> a
     43:49:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):109:115 -> a
-    50:50:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    50:50:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     50:50:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):39 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     51:51:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):39:39 -> a
-    52:52:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    52:52:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     52:52:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):40 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     53:70:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):40:57 -> a
@@ -1259,7 +1266,7 @@
     128:128:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):44:44 -> a
     129:129:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):45:45 -> a
     118:126:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):47:55 -> a
-com.android.tools.r8.DexFileMergerHelper$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.bh:
+com.android.tools.r8.DexFileMergerHelper$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.fh:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.StringBuilder com.android.tools.r8.DexFileMergerHelper$$InternalSyntheticOutline$166$9c9cadf1489a20b6e2f21254b49c29d5709cced0f7609f978195acf1f013b7c9$0.m(java.lang.String):0:2 -> a
@@ -1633,7 +1640,7 @@
     661:661:void main(java.lang.String[]):172:172 -> main
     662:662:void main(java.lang.String[]):172:172 -> main
     609:609:void main(java.lang.String[]):172:172 -> main
-com.android.tools.r8.ExtractMarker$VdexOrigin -> com.android.tools.r8.internal.ck:
+com.android.tools.r8.ExtractMarker$VdexOrigin -> com.android.tools.r8.internal.hk:
     int index -> f
     1:2:void <init>(com.android.tools.r8.origin.Origin,int):35:36 -> <init>
     1:1:java.lang.String part():41:41 -> part
@@ -1724,143 +1731,143 @@
     21:22:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode(com.android.tools.r8.graph.DexMethod):157:158 -> a
     21:22:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):173 -> a
     23:34:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):176:187 -> a
-    35:67:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):185:217 -> a
-    68:89:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):239:260 -> a
-    90:90:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():438:438 -> a
-    90:90:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):261 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    35:68:void addMethodsToHeaderJar(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):185:218 -> a
+    69:90:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):240:261 -> a
     91:91:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():438:438 -> a
-    91:91:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):261 -> a
-    92:101:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):265:274 -> a
-    102:102:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):257:257 -> a
-    103:103:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":411,"2":412,"3":413}}
-    411:411:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):257:257 -> a
-    412:412:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):257:257 -> a
-    413:413:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):257:257 -> a
-    360:410:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):257:307 -> a
-    414:414:java.util.List lambda$collectSupportedMethods$0(com.android.tools.r8.graph.DexClass):268:268 -> a
-    415:423:void lambda$collectSupportedMethods$3(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.DexMethod):295:303 -> a
-    424:424:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):318:318 -> a
-    425:425:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":750,"2":751,"3":752}}
-    750:750:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):318:318 -> a
-    751:751:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):318:318 -> a
-    752:752:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):318:318 -> a
-    743:745:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):318:320 -> a
-    746:746:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":753,"2":754,"3":755}}
-    753:753:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):312:312 -> a
-    753:753:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):323 -> a
-    754:754:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):312:312 -> a
-    754:754:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):323 -> a
-    755:755:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):312:312 -> a
-    755:755:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):323 -> a
-    747:747:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):312:312 -> a
-    747:747:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):323 -> a
-    748:748:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):323:323 -> a
-    749:749:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):320:320 -> a
-    756:785:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):333:362 -> a
-    786:793:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):361:368 -> a
-    794:794:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):367:367 -> a
-    795:803:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):366:374 -> a
-    804:816:void lambda$writeLintFiles$4(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):338:350 -> a
-    817:817:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
-    817:817:void lambda$writeLintFiles$4(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):350 -> a
-    818:818:void lambda$writeLintFiles$4(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):350:350 -> a
-    819:829:void lambda$writeLintFiles$4(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):346:356 -> a
-    830:843:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):382:395 -> a
-    844:844:boolean lambda$generateLintFiles$5(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):392:392 -> a
-    845:845:void run(int):410:410 -> a
-    846:846:void run(int):409:409 -> a
-    847:852:boolean lambda$run$7(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):413:418 -> a
-    853:853:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):475:475 -> a
-    853:853:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$300(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):453 -> a
+    91:91:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):262 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    853:853:void lambda$generateClassHTML$9(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):768 -> a
-    854:854:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):475:475 -> a
-    854:854:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$300(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):453 -> a
-    854:854:void lambda$generateClassHTML$9(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):768 -> a
-    855:869:void generateClassHTML(java.io.PrintStream,com.android.tools.r8.graph.DexClass,boolean,java.util.function.Predicate,java.util.function.Predicate):763:777 -> a
-    870:870:boolean lambda$generateClassHTML$8(com.android.tools.r8.graph.DexEncodedField):766:766 -> a
-    871:872:boolean lambda$generateClassHTML$10(com.android.tools.r8.graph.DexEncodedMethod):773:774 -> a
-    873:873:void lambda$generateClassHTML$11(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):776:776 -> a
-    874:874:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):453:453 -> a
-    874:874:void lambda$generateClassHTML$11(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):776 -> a
-    875:879:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addMethod(com.android.tools.r8.graph.DexEncodedMethod):480:484 -> a
-    875:879:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):453 -> a
-    875:879:void lambda$generateClassHTML$11(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):776 -> a
-    880:891:void generateDesugaredLibraryApisDocumetation():781:792 -> a
-    892:892:void lambda$generateDesugaredLibraryApisDocumetation$16(java.io.PrintStream,com.android.tools.r8.graph.DexClass):786:786 -> a
-    893:893:boolean lambda$generateDesugaredLibraryApisDocumetation$17(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):790:790 -> a
-    894:894:void lambda$generateDesugaredLibraryApisDocumetation$21(java.io.PrintStream,com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):794:794 -> a
-    895:895:boolean lambda$generateDesugaredLibraryApisDocumetation$20(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):799:799 -> a
-    896:897:void main(java.lang.String[]):803:804 -> a
-    898:902:void run():400:404 -> a
-    898:902:void main(java.lang.String[]):804 -> a
-    903:908:void main(java.lang.String[]):807:812 -> a
+    92:92:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():438:438 -> a
+    92:92:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):262 -> a
+    93:102:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):266:275 -> a
+    103:103:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):258:258 -> a
+    104:104:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":413,"2":414,"3":415}}
+    413:413:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):258:258 -> a
+    414:414:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):258:258 -> a
+    415:415:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):258:258 -> a
+    362:412:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):258:308 -> a
+    416:416:java.util.List lambda$collectSupportedMethods$0(com.android.tools.r8.graph.DexClass):269:269 -> a
+    417:425:void lambda$collectSupportedMethods$3(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.function.Predicate,java.util.Map,com.android.tools.r8.graph.DexMethod):296:304 -> a
+    426:426:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):319:319 -> a
+    427:427:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":753,"2":754,"3":755}}
+    753:753:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):319:319 -> a
+    754:754:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):319:319 -> a
+    755:755:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):319:319 -> a
+    746:748:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):319:321 -> a
+    749:749:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":756,"2":757,"3":758}}
+    756:756:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):313:313 -> a
+    756:756:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):324 -> a
+    757:757:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):313:313 -> a
+    757:757:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):324 -> a
+    758:758:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):313:313 -> a
+    758:758:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):324 -> a
+    750:750:java.lang.String lintBaseFileName(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel):313:313 -> a
+    750:750:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):324 -> a
+    751:751:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):324:324 -> a
+    752:752:java.nio.file.Path lintFile(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):321:321 -> a
+    759:788:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):334:363 -> a
+    789:796:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):362:369 -> a
+    797:797:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):368:368 -> a
+    798:806:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):367:375 -> a
+    807:819:void lambda$writeLintFiles$4(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):339:351 -> a
+    820:820:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():118:118 -> a
+    820:820:void lambda$writeLintFiles$4(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):351 -> a
+    821:821:void lambda$writeLintFiles$4(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):351:351 -> a
+    822:832:void lambda$writeLintFiles$4(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):347:357 -> a
+    833:846:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):383:396 -> a
+    847:847:boolean lambda$generateLintFiles$5(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):393:393 -> a
+    848:848:void run(int):411:411 -> a
+    849:849:void run(int):410:410 -> a
+    850:855:boolean lambda$run$7(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):414:419 -> a
+    856:856:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):476:476 -> a
+    856:856:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$300(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):454 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    856:856:void lambda$generateClassHTML$9(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):769 -> a
+    857:857:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):476:476 -> a
+    857:857:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$300(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):454 -> a
+    857:857:void lambda$generateClassHTML$9(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):769 -> a
+    858:872:void generateClassHTML(java.io.PrintStream,com.android.tools.r8.graph.DexClass,boolean,java.util.function.Predicate,java.util.function.Predicate):764:778 -> a
+    873:873:boolean lambda$generateClassHTML$8(com.android.tools.r8.graph.DexEncodedField):767:767 -> a
+    874:875:boolean lambda$generateClassHTML$10(com.android.tools.r8.graph.DexEncodedMethod):774:775 -> a
+    876:876:void lambda$generateClassHTML$11(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):777:777 -> a
+    877:877:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):454:454 -> a
+    877:877:void lambda$generateClassHTML$11(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):777 -> a
+    878:882:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addMethod(com.android.tools.r8.graph.DexEncodedMethod):481:485 -> a
+    878:882:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$200(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):454 -> a
+    878:882:void lambda$generateClassHTML$11(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedMethod):777 -> a
+    883:894:void generateDesugaredLibraryApisDocumetation():782:793 -> a
+    895:895:void lambda$generateDesugaredLibraryApisDocumetation$16(java.io.PrintStream,com.android.tools.r8.graph.DexClass):787:787 -> a
+    896:896:boolean lambda$generateDesugaredLibraryApisDocumetation$17(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):791:791 -> a
+    897:897:void lambda$generateDesugaredLibraryApisDocumetation$21(java.io.PrintStream,com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):795:795 -> a
+    898:898:boolean lambda$generateDesugaredLibraryApisDocumetation$20(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):800:800 -> a
+    899:900:void main(java.lang.String[]):804:805 -> a
+    901:905:void run():401:405 -> a
+    901:905:void main(java.lang.String[]):805 -> a
+    906:911:void main(java.lang.String[]):808:813 -> a
     boolean lambda$generateDesugaredLibraryApisDocumetation$12(com.android.tools.r8.graph.DexEncodedMethod) -> b
     boolean lambda$generateDesugaredLibraryApisDocumetation$14(com.android.tools.r8.graph.DexEncodedField) -> b
-    1:1:java.util.List lambda$collectSupportedMethods$1(com.android.tools.r8.graph.DexClass):286:286 -> b
-    2:2:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel):411:411 -> b
+    1:1:java.util.List lambda$collectSupportedMethods$1(com.android.tools.r8.graph.DexClass):287:287 -> b
+    2:2:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel):412:412 -> b
     boolean lambda$generateDesugaredLibraryApisDocumetation$15(com.android.tools.r8.graph.DexEncodedMethod) -> c
     boolean lambda$generateDesugaredLibraryApisDocumetation$19(com.android.tools.r8.graph.DexEncodedField) -> c
-    1:1:java.util.List lambda$collectSupportedMethods$2(com.android.tools.r8.graph.DexClass):303:303 -> c
-    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$13(com.android.tools.r8.graph.DexClass):785:785 -> d
-    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$18(com.android.tools.r8.graph.DexClass):791:791 -> e
+    1:1:java.util.List lambda$collectSupportedMethods$2(com.android.tools.r8.graph.DexClass):304:304 -> c
+    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$13(com.android.tools.r8.graph.DexClass):786:786 -> d
+    1:1:java.lang.String lambda$generateDesugaredLibraryApisDocumetation$18(com.android.tools.r8.graph.DexClass):792:792 -> e
 com.android.tools.r8.GenerateLintFiles$HTMLBuilder -> com.android.tools.r8.E:
     java.lang.String indent -> d
-    1:3:void <init>():630:632 -> <init>
-    4:4:void <init>(com.android.tools.r8.GenerateLintFiles$1):630:630 -> <init>
-    1:1:void decreaseIndent():640:640 -> a
-    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):666 -> a
+    1:3:void <init>():631:633 -> <init>
+    4:4:void <init>(com.android.tools.r8.GenerateLintFiles$1):631:631 -> <init>
+    1:1:void decreaseIndent():641:641 -> a
+    1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667 -> a
     2:2:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9,"3":10}}
-    9:9:void decreaseIndent():640:640 -> a
-    9:9:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):666 -> a
-    10:10:void decreaseIndent():640:640 -> a
-    10:10:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):666 -> a
-    3:3:void decreaseIndent():640:640 -> a
-    3:3:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):666 -> a
-    4:4:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):431:431 -> a
-    4:4:void decreaseIndent():641 -> a
-    4:4:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):666 -> a
+    9:9:void decreaseIndent():641:641 -> a
+    9:9:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667 -> a
+    10:10:void decreaseIndent():641:641 -> a
+    10:10:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667 -> a
+    3:3:void decreaseIndent():641:641 -> a
+    3:3:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667 -> a
+    4:4:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):432:432 -> a
+    4:4:void decreaseIndent():642 -> a
+    4:4:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667 -> a
     5:5:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":11,"2":12,"3":13,"4":14,"5":15,"6":16}}
-    11:11:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667:667 -> a
-    12:12:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667:667 -> a
-    13:13:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667:667 -> a
-    14:14:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667:667 -> a
-    15:15:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667:667 -> a
-    16:16:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667:667 -> a
-    6:8:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):436:438 -> a
-    6:8:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):667 -> a
+    11:11:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):668:668 -> a
+    12:12:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):668:668 -> a
+    13:13:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):668:668 -> a
+    14:14:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):668:668 -> a
+    15:15:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):668:668 -> a
+    16:16:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):668:668 -> a
+    6:8:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):437:439 -> a
+    6:8:com.android.tools.r8.GenerateLintFiles$HTMLBuilder end(java.lang.String):668 -> a
     1:1:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":9,"2":10,"3":11,"4":12,"5":13,"6":14}}
-    9:9:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):660:660 -> b
-    10:10:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):660:660 -> b
-    11:11:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):660:660 -> b
-    12:12:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):660:660 -> b
-    13:13:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):660:660 -> b
-    14:14:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):660:660 -> b
-    2:4:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):436:438 -> b
-    2:4:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):660 -> b
-    5:5:void increaseIndent():635:635 -> b
-    5:5:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661 -> b
+    9:9:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661:661 -> b
+    10:10:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661:661 -> b
+    11:11:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661:661 -> b
+    12:12:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661:661 -> b
+    13:13:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661:661 -> b
+    14:14:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661:661 -> b
+    2:4:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):437:439 -> b
+    2:4:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661 -> b
+    5:5:void increaseIndent():636:636 -> b
+    5:5:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):662 -> b
     6:6:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15,"2":16,"3":17}}
-    15:15:void increaseIndent():635:635 -> b
-    15:15:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661 -> b
-    16:16:void increaseIndent():635:635 -> b
-    16:16:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661 -> b
-    17:17:void increaseIndent():635:635 -> b
-    17:17:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661 -> b
-    7:7:void increaseIndent():635:635 -> b
-    7:7:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661 -> b
-    8:8:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):431:431 -> b
-    8:8:void increaseIndent():636 -> b
-    8:8:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):661 -> b
-com.android.tools.r8.GenerateLintFiles$HTMLBuilder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.sm:
+    15:15:void increaseIndent():636:636 -> b
+    15:15:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):662 -> b
+    16:16:void increaseIndent():636:636 -> b
+    16:16:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):662 -> b
+    17:17:void increaseIndent():636:636 -> b
+    17:17:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):662 -> b
+    7:7:void increaseIndent():636:636 -> b
+    7:7:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):662 -> b
+    8:8:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.indent(java.lang.String):432:432 -> b
+    8:8:void increaseIndent():637 -> b
+    8:8:com.android.tools.r8.GenerateLintFiles$HTMLBuilder start(java.lang.String):662 -> b
+com.android.tools.r8.GenerateLintFiles$HTMLBuilder$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.xm:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.String com.android.tools.r8.GenerateLintFiles$HTMLBuilder$$InternalSyntheticOutline$166$ed6e21f6b1f6064d1f7d01ae8ade57a5452d19bf2d8e818564c5d5284e989760$0.m(java.lang.String,int,int):0:2 -> a
@@ -1869,236 +1876,236 @@
 com.android.tools.r8.GenerateLintFiles$HTMLSourceBuilder -> com.android.tools.r8.F:
     java.util.Set parallelMethods -> h
     boolean $assertionsDisabled -> i
-    1:1:void <clinit>():672:672 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexClass,boolean,java.util.Set):677:678 -> <init>
-    1:11:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):599:609 -> a
-    1:11:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
+    1:1:void <clinit>():673:673 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexClass,boolean,java.util.Set):678:679 -> <init>
+    1:11:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):600:610 -> a
+    1:11:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
     12:12:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":58,"2":59,"3":60,"4":61,"5":62}}
-    58:58:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):610:610 -> a
-    58:58:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    59:59:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):610:610 -> a
-    59:59:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    60:60:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):610:610 -> a
-    60:60:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    61:61:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):610:610 -> a
-    61:61:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    62:62:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):610:610 -> a
-    62:62:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    13:16:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):611:614 -> a
-    13:16:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    17:20:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):511:514 -> a
-    17:20:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):617 -> a
-    17:20:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    21:21:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500:500 -> a
-    21:21:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> a
-    21:21:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):617 -> a
-    21:21:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    22:26:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> a
-    22:26:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500 -> a
-    22:26:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> a
-    22:26:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):617 -> a
-    22:26:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    27:31:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> a
-    27:31:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):502 -> a
-    27:31:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> a
-    27:31:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):617 -> a
-    27:31:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    32:32:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):507:507 -> a
-    32:32:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> a
-    32:32:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):617 -> a
-    32:32:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    33:33:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):617:617 -> a
-    33:33:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    34:37:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):511:514 -> a
-    34:37:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
-    34:37:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    38:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500:500 -> a
-    38:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> a
-    38:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
-    38:38:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> a
-    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500 -> a
-    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> a
-    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
-    39:43:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> a
-    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):502 -> a
-    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> a
-    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
-    44:48:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    49:49:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):507:507 -> a
-    49:49:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> a
-    49:49:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):619 -> a
-    49:49:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    50:57:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):619:626 -> a
-    50:57:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):672 -> a
-    1:4:java.lang.String toString():688:691 -> toString
+    58:58:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):611:611 -> a
+    58:58:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    59:59:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):611:611 -> a
+    59:59:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    60:60:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):611:611 -> a
+    60:60:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    61:61:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):611:611 -> a
+    61:61:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    62:62:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):611:611 -> a
+    62:62:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    13:16:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):612:615 -> a
+    13:16:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    17:20:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):512:515 -> a
+    17:20:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):618 -> a
+    17:20:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    21:21:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501:501 -> a
+    21:21:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> a
+    21:21:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):618 -> a
+    21:21:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    22:26:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> a
+    22:26:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501 -> a
+    22:26:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> a
+    22:26:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):618 -> a
+    22:26:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    27:31:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> a
+    27:31:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):503 -> a
+    27:31:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> a
+    27:31:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):618 -> a
+    27:31:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    32:32:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):508:508 -> a
+    32:32:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> a
+    32:32:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):618 -> a
+    32:32:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    33:33:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):618:618 -> a
+    33:33:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    34:37:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):512:515 -> a
+    34:37:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):620 -> a
+    34:37:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    38:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501:501 -> a
+    38:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> a
+    38:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):620 -> a
+    38:38:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> a
+    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501 -> a
+    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> a
+    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):620 -> a
+    39:43:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> a
+    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):503 -> a
+    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> a
+    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):620 -> a
+    44:48:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    49:49:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):508:508 -> a
+    49:49:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> a
+    49:49:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):620 -> a
+    49:49:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    50:57:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.arguments(com.android.tools.r8.graph.DexEncodedMethod):620:627 -> a
+    50:57:java.lang.String arguments(com.android.tools.r8.graph.DexEncodedMethod):673 -> a
+    1:4:java.lang.String toString():689:692 -> toString
     5:5:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":143,"2":144,"3":145,"4":146,"5":147,"6":148}}
-    143:143:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    143:143:java.lang.String toString():691 -> toString
-    144:144:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    144:144:java.lang.String toString():691 -> toString
-    145:145:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    145:145:java.lang.String toString():691 -> toString
-    146:146:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    146:146:java.lang.String toString():691 -> toString
-    147:147:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    147:147:java.lang.String toString():691 -> toString
-    148:148:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    148:148:java.lang.String toString():691 -> toString
-    6:8:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):436:438 -> toString
-    6:8:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645 -> toString
-    6:8:java.lang.String toString():691 -> toString
-    9:9:java.lang.String toString():693:693 -> toString
-    10:10:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500:500 -> toString
-    10:10:java.lang.String toString():693 -> toString
-    11:15:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> toString
-    11:15:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500 -> toString
-    11:15:java.lang.String toString():693 -> toString
-    16:20:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> toString
-    16:20:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):502 -> toString
-    16:20:java.lang.String toString():693 -> toString
-    21:21:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):507:507 -> toString
-    21:21:java.lang.String toString():693 -> toString
+    143:143:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    143:143:java.lang.String toString():692 -> toString
+    144:144:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    144:144:java.lang.String toString():692 -> toString
+    145:145:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    145:145:java.lang.String toString():692 -> toString
+    146:146:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    146:146:java.lang.String toString():692 -> toString
+    147:147:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    147:147:java.lang.String toString():692 -> toString
+    148:148:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    148:148:java.lang.String toString():692 -> toString
+    6:8:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):437:439 -> toString
+    6:8:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646 -> toString
+    6:8:java.lang.String toString():692 -> toString
+    9:9:java.lang.String toString():694:694 -> toString
+    10:10:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501:501 -> toString
+    10:10:java.lang.String toString():694 -> toString
+    11:15:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> toString
+    11:15:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501 -> toString
+    11:15:java.lang.String toString():694 -> toString
+    16:20:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> toString
+    16:20:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):503 -> toString
+    16:20:java.lang.String toString():694 -> toString
+    21:21:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):508:508 -> toString
+    21:21:java.lang.String toString():694 -> toString
     22:22:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":149,"2":150,"3":151,"4":152,"5":153,"6":154}}
-    149:149:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    149:149:java.lang.String toString():693 -> toString
-    150:150:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    150:150:java.lang.String toString():693 -> toString
-    151:151:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    151:151:java.lang.String toString():693 -> toString
-    152:152:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    152:152:java.lang.String toString():693 -> toString
-    153:153:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    153:153:java.lang.String toString():693 -> toString
-    154:154:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645:645 -> toString
-    154:154:java.lang.String toString():693 -> toString
-    23:25:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):436:438 -> toString
-    23:25:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):645 -> toString
-    23:25:java.lang.String toString():693 -> toString
-    26:33:java.lang.String toString():694:701 -> toString
-    34:37:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):511:514 -> toString
-    34:37:java.lang.String toString():701 -> toString
-    38:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500:500 -> toString
-    38:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> toString
-    38:38:java.lang.String toString():701 -> toString
-    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> toString
-    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500 -> toString
-    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> toString
-    39:43:java.lang.String toString():701 -> toString
-    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> toString
-    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):502 -> toString
-    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> toString
-    44:48:java.lang.String toString():701 -> toString
-    49:49:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):507:507 -> toString
-    49:49:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> toString
-    49:49:java.lang.String toString():701 -> toString
-    50:52:java.lang.String toString():701:703 -> toString
+    149:149:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    149:149:java.lang.String toString():694 -> toString
+    150:150:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    150:150:java.lang.String toString():694 -> toString
+    151:151:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    151:151:java.lang.String toString():694 -> toString
+    152:152:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    152:152:java.lang.String toString():694 -> toString
+    153:153:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    153:153:java.lang.String toString():694 -> toString
+    154:154:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646:646 -> toString
+    154:154:java.lang.String toString():694 -> toString
+    23:25:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):437:439 -> toString
+    23:25:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdCode(java.lang.String):646 -> toString
+    23:25:java.lang.String toString():694 -> toString
+    26:33:java.lang.String toString():695:702 -> toString
+    34:37:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):512:515 -> toString
+    34:37:java.lang.String toString():702 -> toString
+    38:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501:501 -> toString
+    38:38:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> toString
+    38:38:java.lang.String toString():702 -> toString
+    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> toString
+    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501 -> toString
+    39:43:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> toString
+    39:43:java.lang.String toString():702 -> toString
+    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> toString
+    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):503 -> toString
+    44:48:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> toString
+    44:48:java.lang.String toString():702 -> toString
+    49:49:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):508:508 -> toString
+    49:49:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> toString
+    49:49:java.lang.String toString():702 -> toString
+    50:52:java.lang.String toString():702:704 -> toString
     53:53:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":155,"2":156,"3":157,"4":158,"5":159,"6":160}}
-    155:155:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    155:155:java.lang.String toString():698 -> toString
-    156:156:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    156:156:java.lang.String toString():698 -> toString
-    157:157:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    157:157:java.lang.String toString():698 -> toString
-    158:158:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    158:158:java.lang.String toString():698 -> toString
-    159:159:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    159:159:java.lang.String toString():698 -> toString
-    160:160:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    160:160:java.lang.String toString():698 -> toString
-    54:56:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):436:438 -> toString
-    54:56:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655 -> toString
-    54:56:java.lang.String toString():698 -> toString
-    57:60:java.lang.String toString():706:709 -> toString
-    61:61:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500:500 -> toString
-    61:61:java.lang.String toString():711 -> toString
-    62:66:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> toString
-    62:66:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500 -> toString
-    62:66:java.lang.String toString():711 -> toString
-    67:71:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> toString
-    67:71:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):502 -> toString
-    67:71:java.lang.String toString():711 -> toString
-    72:72:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):507:507 -> toString
-    72:72:java.lang.String toString():711 -> toString
-    73:74:java.lang.String toString():711:712 -> toString
+    155:155:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    155:155:java.lang.String toString():699 -> toString
+    156:156:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    156:156:java.lang.String toString():699 -> toString
+    157:157:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    157:157:java.lang.String toString():699 -> toString
+    158:158:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    158:158:java.lang.String toString():699 -> toString
+    159:159:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    159:159:java.lang.String toString():699 -> toString
+    160:160:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    160:160:java.lang.String toString():699 -> toString
+    54:56:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):437:439 -> toString
+    54:56:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656 -> toString
+    54:56:java.lang.String toString():699 -> toString
+    57:60:java.lang.String toString():707:710 -> toString
+    61:61:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501:501 -> toString
+    61:61:java.lang.String toString():712 -> toString
+    62:66:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> toString
+    62:66:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501 -> toString
+    62:66:java.lang.String toString():712 -> toString
+    67:71:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> toString
+    67:71:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):503 -> toString
+    67:71:java.lang.String toString():712 -> toString
+    72:72:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):508:508 -> toString
+    72:72:java.lang.String toString():712 -> toString
+    73:74:java.lang.String toString():712:713 -> toString
     75:75:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":161,"2":162,"3":163,"4":164,"5":165,"6":166}}
-    161:161:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    161:161:java.lang.String toString():708 -> toString
-    162:162:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    162:162:java.lang.String toString():708 -> toString
-    163:163:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    163:163:java.lang.String toString():708 -> toString
-    164:164:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    164:164:java.lang.String toString():708 -> toString
-    165:165:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    165:165:java.lang.String toString():708 -> toString
-    166:166:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    166:166:java.lang.String toString():708 -> toString
-    76:78:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):436:438 -> toString
-    76:78:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655 -> toString
-    76:78:java.lang.String toString():708 -> toString
-    79:85:java.lang.String toString():715:721 -> toString
-    86:89:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):511:514 -> toString
-    86:89:java.lang.String toString():721 -> toString
-    90:90:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500:500 -> toString
-    90:90:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> toString
-    90:90:java.lang.String toString():721 -> toString
-    91:95:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> toString
-    91:95:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):500 -> toString
-    91:95:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> toString
-    91:95:java.lang.String toString():721 -> toString
-    96:100:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):490:494 -> toString
-    96:100:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):502 -> toString
-    96:100:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> toString
-    96:100:java.lang.String toString():721 -> toString
-    101:101:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):507:507 -> toString
-    101:101:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):514 -> toString
-    101:101:java.lang.String toString():721 -> toString
-    102:105:java.lang.String toString():721:724 -> toString
+    161:161:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    161:161:java.lang.String toString():709 -> toString
+    162:162:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    162:162:java.lang.String toString():709 -> toString
+    163:163:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    163:163:java.lang.String toString():709 -> toString
+    164:164:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    164:164:java.lang.String toString():709 -> toString
+    165:165:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    165:165:java.lang.String toString():709 -> toString
+    166:166:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    166:166:java.lang.String toString():709 -> toString
+    76:78:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):437:439 -> toString
+    76:78:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656 -> toString
+    76:78:java.lang.String toString():709 -> toString
+    79:85:java.lang.String toString():716:722 -> toString
+    86:89:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):512:515 -> toString
+    86:89:java.lang.String toString():722 -> toString
+    90:90:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501:501 -> toString
+    90:90:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> toString
+    90:90:java.lang.String toString():722 -> toString
+    91:95:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> toString
+    91:95:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):501 -> toString
+    91:95:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> toString
+    91:95:java.lang.String toString():722 -> toString
+    96:100:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String,java.lang.String):491:495 -> toString
+    96:100:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):503 -> toString
+    96:100:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> toString
+    96:100:java.lang.String toString():722 -> toString
+    101:101:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(java.lang.String):508:508 -> toString
+    101:101:java.lang.String com.android.tools.r8.GenerateLintFiles$SourceBuilder.typeInPackage(com.android.tools.r8.graph.DexType):515 -> toString
+    101:101:java.lang.String toString():722 -> toString
+    102:105:java.lang.String toString():722:725 -> toString
     106:106:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":167,"2":168,"3":169,"4":170,"5":171,"6":172}}
-    167:167:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    167:167:java.lang.String toString():718 -> toString
-    168:168:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    168:168:java.lang.String toString():718 -> toString
-    169:169:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    169:169:java.lang.String toString():718 -> toString
-    170:170:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    170:170:java.lang.String toString():718 -> toString
-    171:171:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    171:171:java.lang.String toString():718 -> toString
-    172:172:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655:655 -> toString
-    172:172:java.lang.String toString():718 -> toString
-    107:109:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):436:438 -> toString
-    107:109:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):655 -> toString
-    107:109:java.lang.String toString():718 -> toString
-    110:136:java.lang.String toString():725:751 -> toString
+    167:167:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    167:167:java.lang.String toString():719 -> toString
+    168:168:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    168:168:java.lang.String toString():719 -> toString
+    169:169:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    169:169:java.lang.String toString():719 -> toString
+    170:170:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    170:170:java.lang.String toString():719 -> toString
+    171:171:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    171:171:java.lang.String toString():719 -> toString
+    172:172:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656:656 -> toString
+    172:172:java.lang.String toString():719 -> toString
+    107:109:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):437:439 -> toString
+    107:109:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendLiCode(java.lang.String):656 -> toString
+    107:109:java.lang.String toString():719 -> toString
+    110:136:java.lang.String toString():726:752 -> toString
     137:137:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":173,"2":174,"3":175,"4":176,"5":177,"6":178}}
-    173:173:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):650:650 -> toString
-    173:173:java.lang.String toString():751 -> toString
-    174:174:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):650:650 -> toString
-    174:174:java.lang.String toString():751 -> toString
-    175:175:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):650:650 -> toString
-    175:175:java.lang.String toString():751 -> toString
-    176:176:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):650:650 -> toString
-    176:176:java.lang.String toString():751 -> toString
-    177:177:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):650:650 -> toString
-    177:177:java.lang.String toString():751 -> toString
-    178:178:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):650:650 -> toString
-    178:178:java.lang.String toString():751 -> toString
-    138:140:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):436:438 -> toString
-    138:140:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):650 -> toString
-    138:140:java.lang.String toString():751 -> toString
-    141:141:java.lang.String toString():752:752 -> toString
-    142:142:java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.toString():449:449 -> toString
-    142:142:java.lang.String toString():753 -> toString
+    173:173:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):651:651 -> toString
+    173:173:java.lang.String toString():752 -> toString
+    174:174:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):651:651 -> toString
+    174:174:java.lang.String toString():752 -> toString
+    175:175:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):651:651 -> toString
+    175:175:java.lang.String toString():752 -> toString
+    176:176:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):651:651 -> toString
+    176:176:java.lang.String toString():752 -> toString
+    177:177:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):651:651 -> toString
+    177:177:java.lang.String toString():752 -> toString
+    178:178:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):651:651 -> toString
+    178:178:java.lang.String toString():752 -> toString
+    138:140:com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.appendLine(java.lang.String):437:439 -> toString
+    138:140:com.android.tools.r8.GenerateLintFiles$HTMLBuilder com.android.tools.r8.GenerateLintFiles$HTMLBuilder.appendTdP(java.lang.String):651 -> toString
+    138:140:java.lang.String toString():752 -> toString
+    141:141:java.lang.String toString():753:753 -> toString
+    142:142:java.lang.String com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent.toString():450:450 -> toString
+    142:142:java.lang.String toString():754 -> toString
 com.android.tools.r8.GenerateLintFiles$SourceBuilder -> com.android.tools.r8.G:
     java.util.List fields -> b
     java.lang.String packageName -> f
@@ -2107,27 +2114,27 @@
     boolean $assertionsDisabled -> g
     boolean newClass -> a
     java.lang.String className -> e
-    1:1:void <clinit>():453:453 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexClass,boolean,com.android.tools.r8.GenerateLintFiles$1):453:453 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexClass,boolean):464:464 -> <init>
-    3:15:void <init>(com.android.tools.r8.graph.DexClass,boolean):457:469 -> <init>
-    1:10:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):546:555 -> a
-    11:16:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):554:559 -> a
-    17:26:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):558:567 -> a
-    27:36:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):571:580 -> a
-    37:42:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):579:584 -> a
-    43:55:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):583:595 -> a
+    1:1:void <clinit>():454:454 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexClass,boolean,com.android.tools.r8.GenerateLintFiles$1):454:454 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexClass,boolean):465:465 -> <init>
+    3:15:void <init>(com.android.tools.r8.graph.DexClass,boolean):458:470 -> <init>
+    1:10:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):547:556 -> a
+    11:16:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):555:560 -> a
+    17:26:java.lang.String accessFlags(com.android.tools.r8.graph.FieldAccessFlags):559:568 -> a
+    27:36:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):572:581 -> a
+    37:42:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):580:585 -> a
+    43:55:java.lang.String accessFlags(com.android.tools.r8.graph.MethodAccessFlags):584:596 -> a
 com.android.tools.r8.GenerateLintFiles$StringBuilderWithIndent -> com.android.tools.r8.H:
     java.lang.StringBuilder builder -> b
     java.lang.String NL -> a
     java.lang.String indent -> c
-    1:1:void <init>():428:428 -> <init>
-    2:4:void <init>():424:426 -> <init>
-    1:1:java.lang.String toString():449:449 -> toString
-com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.internal.tm:
+    1:1:void <init>():429:429 -> <init>
+    2:4:void <init>():425:427 -> <init>
+    1:1:java.lang.String toString():450:450 -> toString
+com.android.tools.r8.GenerateLintFiles$SupportedMethods -> com.android.tools.r8.internal.ym:
     java.util.Map supportedMethods -> b
     java.util.Set classesWithAllMethodsSupported -> a
-    1:3:void <init>(java.util.Set,java.util.Map):227:229 -> <init>
+    1:3:void <init>(java.util.Set,java.util.Map):228:230 -> <init>
 com.android.tools.r8.GenerateMainDexList -> com.android.tools.r8.GenerateMainDexList:
     com.android.tools.r8.utils.Timing timing -> a
     com.android.tools.r8.utils.InternalOptions options -> b
@@ -2231,7 +2238,7 @@
     1:2:void lambda$addMainDexRulesFiles$0(java.nio.file.Path[]):61:62 -> c
     3:8:com.android.tools.r8.GenerateMainDexListCommand makeCommand():108:113 -> c
     3:8:com.android.tools.r8.BaseCommand makeCommand():35 -> c
-    9:14:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.shaking.ProguardConfigurationParser.parse(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):115:120 -> c
+    9:14:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.shaking.ProguardConfigurationParser.parse(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):111:116 -> c
     9:14:com.android.tools.r8.GenerateMainDexListCommand makeCommand():113 -> c
     9:14:com.android.tools.r8.BaseCommand makeCommand():35 -> c
     15:21:com.android.tools.r8.GenerateMainDexListCommand makeCommand():115:121 -> c
@@ -2242,7 +2249,7 @@
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):126:126 -> setMainDexKeptGraphConsumer
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListConsumer(com.android.tools.r8.StringConsumer):101:101 -> setMainDexListConsumer
     1:1:com.android.tools.r8.GenerateMainDexListCommand$Builder setMainDexListOutputPath(java.nio.file.Path):95:95 -> setMainDexListOutputPath
-com.android.tools.r8.GlobalSyntheticsResourceFile -> com.android.tools.r8.internal.Nm:
+com.android.tools.r8.GlobalSyntheticsResourceFile -> com.android.tools.r8.internal.Sm:
     com.android.tools.r8.origin.Origin origin -> b
     java.nio.file.Path file -> a
     1:3:void <init>(java.nio.file.Path):18:20 -> <init>
@@ -2313,7 +2320,7 @@
     53:53:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     54:58:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):137:141 -> a
     54:58:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
-    59:59:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):305:305 -> a
+    59:59:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):312:312 -> a
     59:59:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141 -> a
     59:59:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     60:64:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141:145 -> a
@@ -2328,7 +2335,7 @@
     71:71:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     72:74:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):146:148 -> a
     72:74:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
-    75:75:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():545:545 -> a
+    75:75:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():550:550 -> a
     75:75:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):149 -> a
     75:75:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     76:84:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):149:157 -> a
@@ -2387,10 +2394,10 @@
     45:45:com.android.tools.r8.AssertionsConfiguration$Builder com.android.tools.r8.AssertionsConfiguration.builder(com.android.tools.r8.utils.Reporter):72:72 -> b
     45:45:com.android.tools.r8.utils.InternalOptions getInternalOptions():203 -> b
     46:59:com.android.tools.r8.utils.InternalOptions getInternalOptions():204:217 -> b
-    60:60:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1686:1686 -> b
+    60:60:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1662:1662 -> b
     60:60:com.android.tools.r8.utils.InternalOptions getInternalOptions():217 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    61:61:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1687:1687 -> b
+    61:61:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1663:1663 -> b
     61:61:com.android.tools.r8.utils.InternalOptions getInternalOptions():217 -> b
     62:62:com.android.tools.r8.utils.InternalOptions getInternalOptions():219:219 -> b
     63:63:com.android.tools.r8.dump.DumpOptions dumpOptions():448:448 -> b
@@ -2545,7 +2552,7 @@
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
     1:1:com.android.tools.r8.OutputMode valueOf(java.lang.String):7:7 -> valueOf
     1:1:com.android.tools.r8.OutputMode[] values():7:7 -> values
-com.android.tools.r8.ParseFlagInfoImpl -> com.android.tools.r8.internal.LN:
+com.android.tools.r8.ParseFlagInfoImpl -> com.android.tools.r8.internal.cO:
     java.util.List alternatives -> b
     java.util.List flagHelp -> c
     java.lang.String flagWithArgs -> a
@@ -2733,209 +2740,209 @@
     com.android.tools.r8.utils.Timing timing -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():161:161 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):167:172 -> <init>
+    1:1:void <clinit>():162:162 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):168:173 -> <init>
     boolean lambda$run$3(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexApplication lambda$run$8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication) -> a
-    1:9:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):212:220 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    10:10:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):221 -> a
-    11:11:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):222:222 -> a
-    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():545:545 -> a
-    12:12:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):222 -> a
-    13:22:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):222:231 -> a
-    23:24:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):237:238 -> a
+    1:9:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):213:221 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    10:10:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):222 -> a
+    11:11:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):223:223 -> a
+    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():550:550 -> a
+    12:12:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):223 -> a
+    13:22:void writeApplication(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):223:232 -> a
+    23:24:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):238:239 -> a
     25:25:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> a
-    25:25:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):238 -> a
-    26:26:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):251:251 -> a
-    26:26:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):205 -> a
-    27:37:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):259:269 -> a
+    25:25:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):239 -> a
+    26:26:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):252:252 -> a
+    26:26:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):206 -> a
+    27:37:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):260:270 -> a
     38:38:boolean com.android.tools.r8.utils.AssertionUtils.forTesting(com.android.tools.r8.utils.InternalOptions,java.util.function.Supplier):17:17 -> a
-    38:38:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):269 -> a
-    39:45:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):269:275 -> a
+    38:38:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):270 -> a
+    39:45:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):270:276 -> a
     46:46:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2021,"2":2022,"3":2023}}
-    2021:2021:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):275:275 -> a
-    2022:2022:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):275:275 -> a
-    2023:2023:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):275:275 -> a
-    321:322:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):275:276 -> a
-    323:323:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2024,"2":2025,"3":2026}}
-    2024:2024:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):276:276 -> a
-    2025:2025:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):276:276 -> a
-    2026:2026:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):276:276 -> a
-    599:600:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):276:277 -> a
-    601:601:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2027,"2":2028,"3":2029}}
-    2027:2027:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):277:277 -> a
-    2028:2028:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):277:277 -> a
-    2029:2029:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):277:277 -> a
-    878:901:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):277:300 -> a
-    902:909:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):35:42 -> a
-    902:909:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):300 -> a
-    910:910:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    910:910:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):42 -> a
-    910:910:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):300 -> a
-    911:911:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):42:42 -> a
-    911:911:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):300 -> a
-    912:912:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):37:37 -> a
-    912:912:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):300 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2028,"2":2029,"3":2030}}
+    2028:2028:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):276:276 -> a
+    2029:2029:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):276:276 -> a
+    2030:2030:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):276:276 -> a
+    322:323:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):276:277 -> a
+    324:324:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2031,"2":2032,"3":2033}}
+    2031:2031:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):277:277 -> a
+    2032:2032:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):277:277 -> a
+    2033:2033:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):277:277 -> a
+    601:602:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):277:278 -> a
+    603:603:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2034,"2":2035,"3":2036}}
+    2034:2034:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):278:278 -> a
+    2035:2035:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):278:278 -> a
+    2036:2036:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):278:278 -> a
+    881:904:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):278:301 -> a
+    905:912:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):35:42 -> a
+    905:912:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):301 -> a
     913:913:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    913:913:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):37 -> a
-    913:913:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):300 -> a
-    914:914:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):37:37 -> a
-    914:914:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):300 -> a
-    915:919:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):35:39 -> a
-    915:919:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):302 -> a
-    920:920:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):34:34 -> a
-    920:920:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):302 -> a
-    921:930:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):303:312 -> a
-    931:944:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):311:324 -> a
-    945:945:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):323:323 -> a
-    946:961:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):320:335 -> a
-    962:966:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):334:338 -> a
-    967:967:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):337:337 -> a
-    968:979:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):336:347 -> a
-    980:980:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):346:346 -> a
-    981:986:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):343:348 -> a
-    987:1029:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):342:384 -> a
-    1030:1065:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):383:418 -> a
-    1066:1114:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):413:461 -> a
-    1115:1236:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):458:579 -> a
-    1237:1262:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):576:601 -> a
-    1263:1284:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):599:620 -> a
-    1285:1303:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):615:633 -> a
-    1304:1352:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):632:680 -> a
-    1353:1445:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):661:753 -> a
-    1446:1457:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):749:760 -> a
-    1458:1536:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):759:837 -> a
-    1537:1551:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):780:794 -> a
-    1552:1563:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):791:802 -> a
-    1564:1567:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):23:26 -> a
-    1564:1567:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):802 -> a
-    1568:1569:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):802:803 -> a
-    1570:1577:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.RecordRewritingNamingLens.createRecordRewritingNamingLens(com.android.tools.r8.graph.AppView):24:31 -> a
-    1570:1577:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):803 -> a
-    1578:1612:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):803:837 -> a
-    1613:1614:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):537:538 -> a
-    1615:2020:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):434:839 -> a
-    2030:2030:java.lang.Boolean lambda$run$2():269:269 -> a
-    2031:2031:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):392:392 -> a
-    2032:2032:void lambda$run$9(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):592:592 -> a
-    2033:2033:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$10(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):600:600 -> a
-    2034:2034:void lambda$run$13(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):675:675 -> a
-    2035:2035:void lambda$run$14(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):682:682 -> a
-    2036:2036:void lambda$run$15(java.lang.String):775:775 -> a
-    2037:2037:boolean lambda$run$16(com.android.tools.r8.graph.DexProgramClass):781:781 -> a
-    2038:2044:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):844:850 -> a
-    2045:2048:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):852:855 -> a
-    2049:2049:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):854:854 -> a
-    2050:2064:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):882:896 -> a
-    2065:2072:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):895:902 -> a
-    2073:2073:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):901:901 -> a
-    2074:2076:java.lang.Iterable lambda$performFinalMainDexTracing$20(com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.graph.AppView):904:906 -> a
-    2077:2079:void lambda$performFinalMainDexTracing$19(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):908:910 -> a
-    2080:2081:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):926:927 -> a
-    2082:2082:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$22(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):929:929 -> a
-    2083:2083:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):932:932 -> a
-    2084:2084:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    2084:2084:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):932 -> a
+    913:913:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):42 -> a
+    913:913:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):301 -> a
+    914:914:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):42:42 -> a
+    914:914:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):301 -> a
+    915:915:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):37:37 -> a
+    915:915:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):301 -> a
+    916:916:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    916:916:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):37 -> a
+    916:916:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):301 -> a
+    917:917:void com.android.tools.r8.shaking.MainDexListBuilder.checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo):37:37 -> a
+    917:917:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):301 -> a
+    918:922:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):35:39 -> a
+    918:922:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):303 -> a
+    923:923:void com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.run(com.android.tools.r8.graph.AppView):34:34 -> a
+    923:923:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):303 -> a
+    924:933:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):304:313 -> a
+    934:947:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):312:325 -> a
+    948:948:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):324:324 -> a
+    949:964:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):321:336 -> a
+    965:969:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):335:339 -> a
+    970:970:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):338:338 -> a
+    971:983:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):337:349 -> a
+    984:984:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):348:348 -> a
+    985:991:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):345:351 -> a
+    992:1036:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):344:388 -> a
+    1037:1072:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):387:422 -> a
+    1073:1121:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):417:465 -> a
+    1122:1243:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):462:583 -> a
+    1244:1269:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):580:605 -> a
+    1270:1291:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):603:624 -> a
+    1292:1310:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):619:637 -> a
+    1311:1359:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):636:684 -> a
+    1360:1452:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):665:757 -> a
+    1453:1464:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):753:764 -> a
+    1465:1543:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):763:841 -> a
+    1544:1558:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):784:798 -> a
+    1559:1570:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):795:806 -> a
+    1571:1574:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.PrefixRewritingNamingLens.createPrefixRewritingNamingLens(com.android.tools.r8.graph.AppView):23:26 -> a
+    1571:1574:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):806 -> a
+    1575:1576:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):806:807 -> a
+    1577:1584:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.RecordRewritingNamingLens.createRecordRewritingNamingLens(com.android.tools.r8.graph.AppView):24:31 -> a
+    1577:1584:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):807 -> a
+    1585:1619:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):807:841 -> a
+    1620:1621:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):541:542 -> a
+    1622:2027:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):438:843 -> a
+    2037:2037:java.lang.Boolean lambda$run$2():270:270 -> a
+    2038:2038:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):396:396 -> a
+    2039:2039:void lambda$run$9(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):596:596 -> a
+    2040:2040:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$10(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):604:604 -> a
+    2041:2041:void lambda$run$13(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):679:679 -> a
+    2042:2042:void lambda$run$14(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):686:686 -> a
+    2043:2043:void lambda$run$15(java.lang.String):779:779 -> a
+    2044:2044:boolean lambda$run$16(com.android.tools.r8.graph.DexProgramClass):785:785 -> a
+    2045:2051:boolean allReferencesAssignedApiLevel(com.android.tools.r8.graph.AppView):848:854 -> a
+    2052:2055:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):856:859 -> a
+    2056:2056:void lambda$allReferencesAssignedApiLevel$18(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMember):858:858 -> a
+    2057:2071:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):886:900 -> a
+    2072:2079:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):899:906 -> a
+    2080:2080:void performFinalMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):905:905 -> a
+    2081:2083:java.lang.Iterable lambda$performFinalMainDexTracing$20(com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.graph.AppView):908:910 -> a
+    2084:2086:void lambda$performFinalMainDexTracing$19(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):912:914 -> a
+    2087:2088:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):930:931 -> a
+    2089:2089:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$22(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):933:933 -> a
+    2090:2090:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):936:936 -> a
+    2091:2091:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    2091:2091:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):936 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2085:2092:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):933:940 -> a
-    2093:2094:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):952:953 -> a
-    2093:2094:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):940 -> a
-    2095:2095:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    2095:2095:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):953 -> a
-    2095:2095:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):940 -> a
-    2096:2097:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):956:957 -> a
-    2096:2097:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):940 -> a
-    2098:2099:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):941:942 -> a
-    2100:2104:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):963:967 -> a
-    2100:2104:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):942 -> a
-    2105:2105:boolean com.android.tools.r8.graph.DexDebugEvent.isPositionFrame():0:0 -> a
-    2105:2105:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):967 -> a
-    2105:2105:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):942 -> a
-    2106:2106:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):968:968 -> a
-    2106:2106:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):942 -> a
-    2107:2107:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):967:967 -> a
-    2107:2107:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):942 -> a
-    2108:2108:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):944:944 -> a
-    2109:2109:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    2109:2109:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):944 -> a
-    2110:2110:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
-    2110:2110:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):944 -> a
-    2111:2111:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):944:944 -> a
-    2112:2125: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:995 -> a
-    2126:2128:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):87:89 -> a
-    2126:2128: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):996 -> a
-    2129:2139: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):1000:1010 -> a
-    2140:2140:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1008:1008 -> a
-    2141:2143: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):1029:1031 -> a
-    2144:2179: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):1030:1065 -> a
-    2180:2184: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):1062:1066 -> a
-    2185:2188:boolean verifyNoJarApplicationReaders(java.util.Collection):1070:1073 -> a
-    2189:2189:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1095:1095 -> a
-    2190:2190:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):251:251 -> a
-    2190:2190:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1095 -> a
-    2191:2191:void lambda$main$26(java.lang.String[]):1111:1111 -> a
-    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):251:251 -> b
-    1:1:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):242 -> b
-    2:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):244:245 -> b
-    4:4:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):255:255 -> b
-    5:14:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):865:874 -> b
-    15:18:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):873:876 -> b
-    19:19:void lambda$runEnqueuer$24(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1012:1012 -> b
-    20:21:void run(java.lang.String[]):1081:1082 -> b
+    2092:2099:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):937:944 -> a
+    2100:2101:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):956:957 -> a
+    2100:2101:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):944 -> a
+    2102:2102:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    2102:2102:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):957 -> a
+    2102:2102:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):944 -> a
+    2103:2104:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):960:961 -> a
+    2103:2104:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):944 -> a
+    2105:2106:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):945:946 -> a
+    2107:2111:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):967:971 -> a
+    2107:2111:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):946 -> a
+    2112:2112:boolean com.android.tools.r8.graph.DexDebugEvent.isPositionFrame():0:0 -> a
+    2112:2112:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):971 -> a
+    2112:2112:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):946 -> a
+    2113:2113:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):972:972 -> a
+    2113:2113:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):946 -> a
+    2114:2114:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):971:971 -> a
+    2114:2114:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):946 -> a
+    2115:2115:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):948:948 -> a
+    2116:2116:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
+    2116:2116:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):948 -> a
+    2117:2117:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
+    2117:2117:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):948 -> a
+    2118:2118:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$21(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):948:948 -> a
+    2119:2132: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):986:999 -> a
+    2133:2135:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):87:89 -> a
+    2133:2135: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):1000 -> a
+    2136:2146: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):1004:1014 -> a
+    2147:2147:void lambda$runEnqueuer$23(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1012:1012 -> a
+    2148:2150: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):1033:1035 -> a
+    2151:2186: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):1034:1069 -> a
+    2187:2191: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):1066:1070 -> a
+    2192:2195:boolean verifyNoJarApplicationReaders(java.util.Collection):1074:1077 -> a
+    2196:2196:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1099:1099 -> a
+    2197:2197:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):252:252 -> a
+    2197:2197:void lambda$run$25(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1099 -> a
+    2198:2198:void lambda$main$26(java.lang.String[]):1115:1115 -> a
+    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):252:252 -> b
+    1:1:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):243 -> b
+    2:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):245:246 -> b
+    4:4:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):256:256 -> b
+    5:14:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):869:878 -> b
+    15:18:void performInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):877:880 -> b
+    19:19:void lambda$runEnqueuer$24(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1016:1016 -> b
+    20:21:void run(java.lang.String[]):1085:1086 -> b
     22:22:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    22:22:void run(java.lang.String[]):1083 -> b
-    23:23:void run(java.lang.String[]):1084:1084 -> b
-    24:24:java.lang.String com.android.tools.r8.R8Command.getUsageMessage():699:699 -> b
-    24:24:void run(java.lang.String[]):1084 -> b
+    22:22:void run(java.lang.String[]):1087 -> b
+    23:23:void run(java.lang.String[]):1088:1088 -> b
+    24:24:java.lang.String com.android.tools.r8.R8Command.getUsageMessage():712:712 -> b
+    24:24:void run(java.lang.String[]):1088 -> b
     25:33:java.lang.String com.android.tools.r8.R8CommandParser.getUsageMessage():112:120 -> b
-    25:33:java.lang.String com.android.tools.r8.R8Command.getUsageMessage():699 -> b
-    25:33:void run(java.lang.String[]):1084 -> b
-    34:34:void run(java.lang.String[]):1084:1084 -> b
+    25:33:java.lang.String com.android.tools.r8.R8Command.getUsageMessage():712 -> b
+    25:33:void run(java.lang.String[]):1088 -> b
+    34:34:void run(java.lang.String[]):1088:1088 -> b
     35:35:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
     35:35:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
     35:35:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
     35:35:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
-    35:35:void run(java.lang.String[]):1083 -> b
-    36:37:void run(java.lang.String[]):1087:1088 -> b
+    35:35:void run(java.lang.String[]):1087 -> b
+    36:37:void run(java.lang.String[]):1091:1092 -> b
     38:38:void run(java.lang.String[]):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1136,"2":1137,"3":1138}}
-    1136:1136:void run(java.lang.String[]):1088:1088 -> b
-    1137:1137:void run(java.lang.String[]):1088:1088 -> b
-    1138:1138:void run(java.lang.String[]):1088:1088 -> b
-    1126:1132:void run(java.lang.String[]):1088:1094 -> b
-    1133:1133:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> b
-    1133:1133:void run(java.lang.String[]):1094 -> b
-    1134:1135:void run(java.lang.String[]):1097:1098 -> b
-    1:1:java.lang.Iterable lambda$run$11(com.android.tools.r8.graph.AppView):634:634 -> c
-    1:1:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):652:652 -> d
-    2:5:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):651:654 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1140,"2":1141,"3":1142}}
+    1140:1140:void run(java.lang.String[]):1092:1092 -> b
+    1141:1141:void run(java.lang.String[]):1092:1092 -> b
+    1142:1142:void run(java.lang.String[]):1092:1092 -> b
+    1130:1136:void run(java.lang.String[]):1092:1098 -> b
+    1137:1137:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):69:69 -> b
+    1137:1137:void run(java.lang.String[]):1098 -> b
+    1138:1139:void run(java.lang.String[]):1101:1102 -> b
+    1:1:java.lang.Iterable lambda$run$11(com.android.tools.r8.graph.AppView):638:638 -> c
+    1:1:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):656:656 -> d
+    2:5:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):655:658 -> d
     6:6:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.isValid():59:59 -> d
-    6:6:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):654 -> d
-    7:7:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):651:651 -> d
-    1:3:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):816:818 -> e
-    4:7:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):817:820 -> e
+    6:6:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):658 -> d
+    7:7:java.lang.Boolean lambda$run$12(com.android.tools.r8.graph.AppView):655:655 -> d
+    1:3:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):820:822 -> e
+    4:7:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):821:824 -> e
     8:8:boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult.isValid():59:59 -> e
-    8:8:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):820 -> e
-    9:9:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):816:816 -> e
-    1:1:java.lang.Boolean lambda$run$5(com.android.tools.r8.graph.AppView):431:431 -> f
-    1:1:java.lang.Boolean lambda$run$6(com.android.tools.r8.graph.AppView):443:443 -> g
-    1:1:java.lang.Boolean lambda$run$7(com.android.tools.r8.graph.AppView):518:518 -> h
-    1:5:void main(java.lang.String[]):1107:1111 -> main
-    6:7:void main(java.lang.String[]):1108:1109 -> main
-    8:8:java.lang.String com.android.tools.r8.R8Command.getUsageMessage():699:699 -> main
-    8:8:void main(java.lang.String[]):1109 -> main
+    8:8:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):824 -> e
+    9:9:java.lang.Boolean lambda$run$17(com.android.tools.r8.graph.AppView):820:820 -> e
+    1:1:java.lang.Boolean lambda$run$5(com.android.tools.r8.graph.AppView):435:435 -> f
+    1:1:java.lang.Boolean lambda$run$6(com.android.tools.r8.graph.AppView):447:447 -> g
+    1:1:java.lang.Boolean lambda$run$7(com.android.tools.r8.graph.AppView):522:522 -> h
+    1:5:void main(java.lang.String[]):1111:1115 -> main
+    6:7:void main(java.lang.String[]):1112:1113 -> main
+    8:8:java.lang.String com.android.tools.r8.R8Command.getUsageMessage():712:712 -> main
+    8:8:void main(java.lang.String[]):1113 -> main
     9:17:java.lang.String com.android.tools.r8.R8CommandParser.getUsageMessage():112:120 -> main
-    9:17:java.lang.String com.android.tools.r8.R8Command.getUsageMessage():699 -> main
-    9:17:void main(java.lang.String[]):1109 -> main
-    18:18:void main(java.lang.String[]):1109:1109 -> main
-    1:3:void run(com.android.tools.r8.R8Command):184:186 -> run
-    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):200:203 -> run
+    9:17:java.lang.String com.android.tools.r8.R8Command.getUsageMessage():712 -> main
+    9:17:void main(java.lang.String[]):1113 -> main
+    18:18:void main(java.lang.String[]):1113:1113 -> main
+    1:3:void run(com.android.tools.r8.R8Command):185:187 -> run
+    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):201:204 -> 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):202 -> run
+    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):203 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
     boolean skipDump -> M
     boolean enableMissingLibraryApiModeling -> N
@@ -2958,62 +2965,62 @@
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> v
     com.android.tools.r8.StringConsumer proguardSeedsConsumer -> D
     com.android.tools.r8.StringConsumer proguardMapConsumer -> B
-    1:1:void <clinit>():69:69 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,boolean,java.util.Optional,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,boolean,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.SourceFileProvider,boolean,com.android.tools.r8.R8Command$1):70:70 -> <init>
-    2:2:void <init>(boolean,boolean,com.android.tools.r8.R8Command$1):70:70 -> <init>
-    3:41:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,boolean,java.util.Optional,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,boolean,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.SourceFileProvider,boolean):812:850 -> <init>
-    42:62:void <init>(boolean,boolean):854:874 -> <init>
-    1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):735:735 -> a
-    2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):740:740 -> a
-    1:23:com.android.tools.r8.utils.InternalOptions getInternalOptions():898:920 -> b
-    24:46:com.android.tools.r8.utils.InternalOptions getInternalOptions():919:941 -> b
-    47:49:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):1043:1045 -> b
-    47:49:com.android.tools.r8.utils.InternalOptions getInternalOptions():938 -> b
-    50:60:com.android.tools.r8.utils.InternalOptions getInternalOptions():938:948 -> b
-    61:63:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):1043:1045 -> b
-    61:63:com.android.tools.r8.utils.InternalOptions getInternalOptions():945 -> b
-    64:74:com.android.tools.r8.utils.InternalOptions getInternalOptions():945:955 -> b
-    75:77:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):1043:1045 -> b
-    75:77:com.android.tools.r8.utils.InternalOptions getInternalOptions():952 -> b
-    78:88:com.android.tools.r8.utils.InternalOptions getInternalOptions():952:962 -> b
-    89:91:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):1043:1045 -> b
-    89:91:com.android.tools.r8.utils.InternalOptions getInternalOptions():959 -> b
-    92:108:com.android.tools.r8.utils.InternalOptions getInternalOptions():959:975 -> b
-    109:117:com.android.tools.r8.utils.InternalOptions getInternalOptions():974:982 -> b
-    118:118:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1686:1686 -> b
-    118:118:com.android.tools.r8.utils.InternalOptions getInternalOptions():982 -> b
+    1:1:void <clinit>():70:70 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,boolean,java.util.Optional,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,boolean,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.SourceFileProvider,boolean,com.android.tools.r8.R8Command$1):71:71 -> <init>
+    2:2:void <init>(boolean,boolean,com.android.tools.r8.R8Command$1):71:71 -> <init>
+    3:41:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ProgramConsumer,java.util.List,com.android.tools.r8.StringConsumer,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.CompilationMode,int,com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.InternalOptions$DesugarState,boolean,boolean,boolean,boolean,java.util.Optional,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.StringConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.function.Consumer,boolean,boolean,java.util.function.BiPredicate,com.android.tools.r8.StringConsumer,com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.features.FeatureSplitConfiguration,java.util.List,java.util.List,java.lang.String,boolean,int,com.android.tools.r8.utils.DumpInputFlags,com.android.tools.r8.MapIdProvider,com.android.tools.r8.SourceFileProvider,boolean):825:863 -> <init>
+    42:62:void <init>(boolean,boolean):867:887 -> <init>
+    1:1:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):748:748 -> a
+    2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):753:753 -> a
+    1:23:com.android.tools.r8.utils.InternalOptions getInternalOptions():911:933 -> b
+    24:46:com.android.tools.r8.utils.InternalOptions getInternalOptions():932:954 -> b
+    47:49:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):1056:1058 -> b
+    47:49:com.android.tools.r8.utils.InternalOptions getInternalOptions():951 -> b
+    50:60:com.android.tools.r8.utils.InternalOptions getInternalOptions():951:961 -> b
+    61:63:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):1056:1058 -> b
+    61:63:com.android.tools.r8.utils.InternalOptions getInternalOptions():958 -> b
+    64:74:com.android.tools.r8.utils.InternalOptions getInternalOptions():958:968 -> b
+    75:77:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):1056:1058 -> b
+    75:77:com.android.tools.r8.utils.InternalOptions getInternalOptions():965 -> b
+    78:88:com.android.tools.r8.utils.InternalOptions getInternalOptions():965:975 -> b
+    89:91:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):1056:1058 -> b
+    89:91:com.android.tools.r8.utils.InternalOptions getInternalOptions():972 -> b
+    92:108:com.android.tools.r8.utils.InternalOptions getInternalOptions():972:988 -> b
+    109:117:com.android.tools.r8.utils.InternalOptions getInternalOptions():987:995 -> b
+    118:118:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1662:1662 -> b
+    118:118:com.android.tools.r8.utils.InternalOptions getInternalOptions():995 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    119:119:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1687:1687 -> b
-    119:119:com.android.tools.r8.utils.InternalOptions getInternalOptions():982 -> b
-    120:121:com.android.tools.r8.utils.InternalOptions getInternalOptions():986:987 -> b
+    119:119:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableMissingApiModeling():1663:1663 -> b
+    119:119:com.android.tools.r8.utils.InternalOptions getInternalOptions():995 -> b
+    120:121:com.android.tools.r8.utils.InternalOptions getInternalOptions():999:1000 -> b
     122:122:com.android.tools.r8.AssertionsConfiguration$Builder com.android.tools.r8.AssertionsConfiguration.builder(com.android.tools.r8.utils.Reporter):72:72 -> b
-    122:122:com.android.tools.r8.utils.InternalOptions getInternalOptions():987 -> b
-    123:128:com.android.tools.r8.utils.InternalOptions getInternalOptions():988:993 -> b
-    129:129:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> b
-    129:129:com.android.tools.r8.utils.InternalOptions getInternalOptions():998 -> b
-    130:148:com.android.tools.r8.utils.InternalOptions getInternalOptions():999:1017 -> b
-    149:149:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableSubbingOfClasses():1695:1695 -> b
-    149:149:com.android.tools.r8.utils.InternalOptions getInternalOptions():1017 -> b
+    122:122:com.android.tools.r8.utils.InternalOptions getInternalOptions():1000 -> b
+    123:128:com.android.tools.r8.utils.InternalOptions getInternalOptions():1001:1006 -> b
+    129:129:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> b
+    129:129:com.android.tools.r8.utils.InternalOptions getInternalOptions():1011 -> b
+    130:148:com.android.tools.r8.utils.InternalOptions getInternalOptions():1012:1030 -> b
+    149:149:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableSubbingOfClasses():1671:1671 -> b
+    149:149:com.android.tools.r8.utils.InternalOptions getInternalOptions():1030 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    150:157:com.android.tools.r8.utils.InternalOptions getInternalOptions():1019:1026 -> b
-    158:166:com.android.tools.r8.utils.InternalOptions getInternalOptions():1025:1033 -> b
-    167:167:com.android.tools.r8.dump.DumpOptions dumpOptions():1065:1065 -> b
-    167:167:com.android.tools.r8.utils.InternalOptions getInternalOptions():1034 -> b
+    150:157:com.android.tools.r8.utils.InternalOptions getInternalOptions():1032:1039 -> b
+    158:166:com.android.tools.r8.utils.InternalOptions getInternalOptions():1038:1046 -> b
+    167:167:com.android.tools.r8.dump.DumpOptions dumpOptions():1078:1078 -> b
+    167:167:com.android.tools.r8.utils.InternalOptions getInternalOptions():1047 -> b
     168:172:void com.android.tools.r8.BaseCompilerCommand.dumpBaseCommandOptions(com.android.tools.r8.dump.DumpOptions$Builder):129:133 -> b
-    168:172:com.android.tools.r8.dump.DumpOptions dumpOptions():1066 -> b
-    168:172:com.android.tools.r8.utils.InternalOptions getInternalOptions():1034 -> b
-    173:182:com.android.tools.r8.dump.DumpOptions dumpOptions():1067:1076 -> b
-    173:182:com.android.tools.r8.utils.InternalOptions getInternalOptions():1034 -> b
-    183:183:com.android.tools.r8.utils.InternalOptions getInternalOptions():1034:1034 -> b
-    1:1:com.android.tools.r8.R8Command$Builder builder():725:725 -> builder
-    2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):730:730 -> builder
-    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():878:878 -> getDexItemFactory
-    1:1:boolean getEnableMinification():888:888 -> getEnableMinification
-    1:1:boolean getEnableTreeShaking():883:883 -> getEnableTreeShaking
-    1:1:java.util.List getParseFlagsInformation():772:772 -> getParseFlagsInformation
-    1:1:boolean getProguardCompatibility():893:893 -> getProguardCompatibility
-    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):753:753 -> parse
-    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):767:767 -> parse
+    168:172:com.android.tools.r8.dump.DumpOptions dumpOptions():1079 -> b
+    168:172:com.android.tools.r8.utils.InternalOptions getInternalOptions():1047 -> b
+    173:182:com.android.tools.r8.dump.DumpOptions dumpOptions():1080:1089 -> b
+    173:182:com.android.tools.r8.utils.InternalOptions getInternalOptions():1047 -> b
+    183:183:com.android.tools.r8.utils.InternalOptions getInternalOptions():1047:1047 -> b
+    1:1:com.android.tools.r8.R8Command$Builder builder():738:738 -> builder
+    2:2:com.android.tools.r8.R8Command$Builder builder(com.android.tools.r8.DiagnosticsHandler):743:743 -> builder
+    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():891:891 -> getDexItemFactory
+    1:1:boolean getEnableMinification():901:901 -> getEnableMinification
+    1:1:boolean getEnableTreeShaking():896:896 -> getEnableTreeShaking
+    1:1:java.util.List getParseFlagsInformation():785:785 -> getParseFlagsInformation
+    1:1:boolean getProguardCompatibility():906:906 -> getProguardCompatibility
+    1:1:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):766:766 -> parse
+    2:2:com.android.tools.r8.R8Command$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):780:780 -> parse
 com.android.tools.r8.R8Command$Builder -> com.android.tools.r8.R8Command$Builder:
     java.util.Optional includeDataResources -> H
     java.util.List featureSplits -> O
@@ -3024,8 +3031,8 @@
     boolean skipDump -> Q
     boolean enableMissingLibraryApiModeling -> R
     java.util.function.Consumer proguardConfigurationConsumerForTesting -> z
-    boolean allowTestProguardOptions -> S
     boolean $assertionsDisabled -> T
+    com.android.tools.r8.shaking.ProguardConfigurationParserOptions$Builder parserOptionsBuilder -> S
     com.android.tools.r8.InputDependencyGraphConsumer inputDependencyGraphConsumer -> N
     com.android.tools.r8.StringConsumer proguardConfigurationConsumer -> K
     com.android.tools.r8.StringConsumer proguardUsageConsumer -> I
@@ -3037,119 +3044,122 @@
     boolean forceProguardCompatibility -> G
     com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> B
     boolean disableTreeShaking -> D
-    1:1:void <clinit>():77:77 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.R8Command$1):78:78 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.R8Command$1):78:78 -> <init>
-    3:3:void <init>():124:124 -> <init>
-    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):128:128 -> <init>
-    5:27:void <init>(com.android.tools.r8.DiagnosticsHandler):98:120 -> <init>
-    28:28:void <init>(com.android.tools.r8.utils.AndroidApp):132:132 -> <init>
-    29:51:void <init>(com.android.tools.r8.utils.AndroidApp):98:120 -> <init>
-    52:52:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):136:136 -> <init>
-    53:75:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):98:120 -> <init>
-    1:1:com.android.tools.r8.R8Command$Builder setSynthesizedClassesPrefix(java.lang.String):156:156 -> a
-    2:4:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):197:197 -> a
-    5:6:void lambda$addProguardConfigurationFiles$4(java.util.List):232:233 -> a
-    7:7:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):452:452 -> a
-    8:10:void lambda$makeR8Command$6(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):565:567 -> a
-    11:12:void addProguardConfigurationConsumerForTesting(java.util.function.Consumer):646:647 -> a
-    13:15:void lambda$addProguardConfigurationConsumerForTesting$7(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):650:652 -> a
-    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):414:414 -> addFeatureSplit
+    1:1:void <clinit>():78:78 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.R8Command$1):79:79 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.R8Command$1):79:79 -> <init>
+    3:3:void <init>():125:125 -> <init>
+    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):129:129 -> <init>
+    5:27:void <init>(com.android.tools.r8.DiagnosticsHandler):99:121 -> <init>
+    28:28:void <init>(com.android.tools.r8.utils.AndroidApp):133:133 -> <init>
+    29:51:void <init>(com.android.tools.r8.utils.AndroidApp):99:121 -> <init>
+    52:52:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):137:137 -> <init>
+    53:75:void <init>(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.DiagnosticsHandler):99:121 -> <init>
+    1:1:com.android.tools.r8.R8Command$Builder setSynthesizedClassesPrefix(java.lang.String):157:157 -> a
+    2:4:void lambda$addMainDexRules$2(java.util.List,com.android.tools.r8.origin.Origin):198:198 -> a
+    5:6:void lambda$addProguardConfigurationFiles$4(java.util.List):233:234 -> a
+    7:7:com.android.tools.r8.InternalProgramOutputPathConsumer createProgramOutputConsumer(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):453:453 -> a
+    8:10:void lambda$makeR8Command$6(com.android.tools.r8.DataResourceProvider$Visitor,com.android.tools.r8.utils.Reporter,com.android.tools.r8.DataResourceProvider):566:568 -> a
+    11:12:void addProguardConfigurationConsumerForTesting(java.util.function.Consumer):647:648 -> a
+    13:15:void lambda$addProguardConfigurationConsumerForTesting$7(java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.shaking.ProguardConfiguration$Builder):651:653 -> a
+    1:1:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):415:415 -> addFeatureSplit
     2:2:com.android.tools.r8.FeatureSplit$Builder com.android.tools.r8.FeatureSplit.builder(com.android.tools.r8.DiagnosticsHandler):80:80 -> addFeatureSplit
-    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):414 -> addFeatureSplit
-    3:6:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):414:417 -> addFeatureSplit
-    7:21:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):416:430 -> addFeatureSplit
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):195:195 -> addMainDexRules
-    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):184:184 -> addMainDexRulesFiles
-    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):189:189 -> addMainDexRulesFiles
-    1:1:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):77:77 -> addProgramResourceProvider
-    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):401:401 -> addProgramResourceProvider
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):241:241 -> addProguardConfiguration
-    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):221:221 -> addProguardConfigurationFiles
-    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):231:231 -> addProguardConfigurationFiles
-    1:1:void setDisableVerticalClassMerging(boolean):142:142 -> b
-    2:4:void lambda$addProguardConfiguration$5(java.util.List,com.android.tools.r8.origin.Origin):241:241 -> b
-    5:7:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):659:661 -> b
-    1:1:com.android.tools.r8.BaseCommand makeCommand():77:77 -> c
-    2:3:void lambda$addProguardConfigurationFiles$3(java.nio.file.Path[]):222:223 -> c
+    2:2:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):415 -> addFeatureSplit
+    3:6:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):415:418 -> addFeatureSplit
+    7:21:com.android.tools.r8.R8Command$Builder addFeatureSplit(java.util.function.Function):417:431 -> addFeatureSplit
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRules(java.util.List,com.android.tools.r8.origin.Origin):196:196 -> addMainDexRules
+    1:1:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.nio.file.Path[]):185:185 -> addMainDexRulesFiles
+    2:2:com.android.tools.r8.R8Command$Builder addMainDexRulesFiles(java.util.Collection):190:190 -> addMainDexRulesFiles
+    1:1:com.android.tools.r8.BaseCommand$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):78:78 -> addProgramResourceProvider
+    2:2:com.android.tools.r8.R8Command$Builder addProgramResourceProvider(com.android.tools.r8.ProgramResourceProvider):402:402 -> addProgramResourceProvider
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfiguration(java.util.List,com.android.tools.r8.origin.Origin):242:242 -> addProguardConfiguration
+    1:1:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.nio.file.Path[]):222:222 -> addProguardConfigurationFiles
+    2:2:com.android.tools.r8.R8Command$Builder addProguardConfigurationFiles(java.util.List):232:232 -> addProguardConfigurationFiles
+    1:1:void setDisableVerticalClassMerging(boolean):143:143 -> b
+    2:4:void lambda$addProguardConfiguration$5(java.util.List,com.android.tools.r8.origin.Origin):242:242 -> b
+    5:7:void addSyntheticProguardRulesConsumerForTesting(java.util.function.Consumer):660:662 -> b
+    1:1:com.android.tools.r8.BaseCommand makeCommand():78:78 -> c
+    2:3:void lambda$addProguardConfigurationFiles$3(java.nio.file.Path[]):223:224 -> c
     com.android.tools.r8.BaseCommand$Builder self() -> d
-    1:1:void lambda$addMainDexRulesFiles$0(java.nio.file.Path):189:189 -> e
-    1:1:void lambda$addMainDexRulesFiles$1(java.util.Collection):189:189 -> f
-    2:19:void validate():457:474 -> f
+    1:1:void lambda$addMainDexRulesFiles$0(java.nio.file.Path):190:190 -> e
+    1:1:void lambda$addMainDexRulesFiles$1(java.util.Collection):190:190 -> f
+    2:19:void validate():458:475 -> f
     20:20:void validate():0:0 -> f
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":524,"2":525,"3":526}}
-    524:524:void validate():475:475 -> f
-    525:525:void validate():475:475 -> f
-    526:526:void validate():475:475 -> f
-    497:497:void validate():477:477 -> f
-    498:523:void validate():475:500 -> f
-    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():152:152 -> g
-    1:1:boolean getProguardCompatibility():216:216 -> getProguardCompatibility
-    1:1:void allowTestProguardOptions():667:667 -> o
-    1:4:com.android.tools.r8.R8Command makeCommand():506:509 -> p
-    5:5:com.android.tools.r8.R8Command makeCommand():507:507 -> p
-    1:4:com.android.tools.r8.R8Command makeR8Command():513:516 -> q
-    5:10:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.shaking.ProguardConfigurationParser.parse(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):115:120 -> q
-    5:10:com.android.tools.r8.R8Command makeR8Command():516 -> q
-    11:85:com.android.tools.r8.R8Command makeR8Command():519:593 -> q
-    86:86:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():536:536 -> q
-    86:86:com.android.tools.r8.R8Command makeR8Command():594 -> q
-    87:129:com.android.tools.r8.R8Command makeR8Command():597:639 -> q
-    1:1:com.android.tools.r8.R8Command$Builder skipDump():289:289 -> r
-    1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):280:280 -> setDesugaredLibraryKeepRuleConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):178:178 -> setDisableMinification
-    1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):167:167 -> setDisableTreeShaking
-    1:1:com.android.tools.r8.R8Command$Builder setEnableExperimentalMissingLibraryApiModeling(boolean):443:443 -> setEnableExperimentalMissingLibraryApiModeling
-    1:1:com.android.tools.r8.R8Command$Builder setInputDependencyGraphConsumer(com.android.tools.r8.InputDependencyGraphConsumer):353:353 -> setInputDependencyGraphConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):332:332 -> setKeptGraphConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):340:340 -> setMainDexKeptGraphConsumer
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):77:77 -> setOutput
-    2:2:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):77:77 -> setOutput
-    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):372:372 -> setOutput
-    4:5:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):395:396 -> setOutput
-    1:1:com.android.tools.r8.R8Command$Builder setProguardCompatibility(boolean):210:210 -> setProguardCompatibility
-    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):324:324 -> setProguardConfigurationConsumer
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):77:77 -> setProguardMapConsumer
-    2:2:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):270:270 -> setProguardMapConsumer
-    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setProguardMapOutputPath(java.nio.file.Path):77:77 -> setProguardMapOutputPath
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":525,"2":526,"3":527}}
+    525:525:void validate():476:476 -> f
+    526:526:void validate():476:476 -> f
+    527:527:void validate():476:476 -> f
+    498:498:void validate():478:478 -> f
+    499:524:void validate():476:501 -> f
+    1:1:com.android.tools.r8.CompilationMode defaultCompilationMode():153:153 -> g
+    1:1:boolean getProguardCompatibility():217:217 -> getProguardCompatibility
+    1:4:com.android.tools.r8.R8Command makeCommand():507:510 -> o
+    5:5:com.android.tools.r8.R8Command makeCommand():508:508 -> o
+    1:4:com.android.tools.r8.R8Command makeR8Command():514:517 -> p
+    5:10:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.shaking.ProguardConfigurationParser.parse(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):111:116 -> p
+    5:10:com.android.tools.r8.R8Command makeR8Command():517 -> p
+    11:85:com.android.tools.r8.R8Command makeR8Command():520:594 -> p
+    86:86:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():536:536 -> p
+    86:86:com.android.tools.r8.R8Command makeR8Command():595 -> p
+    87:129:com.android.tools.r8.R8Command makeR8Command():598:640 -> p
+    1:1:void setEnableExperimentalCheckEnumUnboxed():667:667 -> q
+    1:1:void setEnableExperimentalConvertCheckNotNull():671:671 -> r
+    1:1:void setEnableExperimentalWhyAreYouNotInlining():675:675 -> s
+    1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):281:281 -> setDesugaredLibraryKeepRuleConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):179:179 -> setDisableMinification
+    1:1:com.android.tools.r8.R8Command$Builder setDisableTreeShaking(boolean):168:168 -> setDisableTreeShaking
+    1:1:com.android.tools.r8.R8Command$Builder setEnableExperimentalMissingLibraryApiModeling(boolean):444:444 -> setEnableExperimentalMissingLibraryApiModeling
+    1:1:com.android.tools.r8.R8Command$Builder setInputDependencyGraphConsumer(com.android.tools.r8.InputDependencyGraphConsumer):354:354 -> setInputDependencyGraphConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):333:333 -> setKeptGraphConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setMainDexKeptGraphConsumer(com.android.tools.r8.experimental.graphinfo.GraphConsumer):341:341 -> setMainDexKeptGraphConsumer
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):78:78 -> setOutput
+    2:2:com.android.tools.r8.BaseCompilerCommand$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):78:78 -> setOutput
+    3:3:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode):373:373 -> setOutput
+    4:5:com.android.tools.r8.R8Command$Builder setOutput(java.nio.file.Path,com.android.tools.r8.OutputMode,boolean):396:397 -> setOutput
+    1:1:com.android.tools.r8.R8Command$Builder setProguardCompatibility(boolean):211:211 -> setProguardCompatibility
+    1:1:com.android.tools.r8.R8Command$Builder setProguardConfigurationConsumer(com.android.tools.r8.StringConsumer):325:325 -> setProguardConfigurationConsumer
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):78:78 -> setProguardMapConsumer
+    2:2:com.android.tools.r8.R8Command$Builder setProguardMapConsumer(com.android.tools.r8.StringConsumer):271:271 -> setProguardMapConsumer
+    1:1:com.android.tools.r8.BaseCompilerCommand$Builder setProguardMapOutputPath(java.nio.file.Path):78:78 -> setProguardMapOutputPath
     2:3:com.android.tools.r8.BaseCompilerCommand$Builder com.android.tools.r8.BaseCompilerCommand$Builder.setProguardMapOutputPath(java.nio.file.Path):321:322 -> setProguardMapOutputPath
-    2:3:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):257 -> setProguardMapOutputPath
-    4:4:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):257:257 -> setProguardMapOutputPath
-    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):313:313 -> setProguardSeedsConsumer
-    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):301:301 -> setProguardUsageConsumer
+    2:3:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):258 -> setProguardMapOutputPath
+    4:4:com.android.tools.r8.R8Command$Builder setProguardMapOutputPath(java.nio.file.Path):258:258 -> setProguardMapOutputPath
+    1:1:com.android.tools.r8.R8Command$Builder setProguardSeedsConsumer(com.android.tools.r8.StringConsumer):314:314 -> setProguardSeedsConsumer
+    1:1:com.android.tools.r8.R8Command$Builder setProguardUsageConsumer(com.android.tools.r8.StringConsumer):302:302 -> setProguardUsageConsumer
+    1:1:void setEnableTestProguardOptions():680:680 -> t
+    1:1:com.android.tools.r8.R8Command$Builder skipDump():290:290 -> u
 com.android.tools.r8.R8Command$Builder$1 -> com.android.tools.r8.O:
     com.android.tools.r8.ProgramResourceProvider val$programResourceProvider -> a
-    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.ProgramResourceProvider):419:419 -> <init>
-    1:1:java.util.Collection getProgramResources():422:422 -> getProgramResources
+    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.ProgramResourceProvider):420:420 -> <init>
+    1:1:java.util.Collection getProgramResources():423:423 -> getProgramResources
 com.android.tools.r8.R8Command$Builder$2 -> com.android.tools.r8.P:
     com.android.tools.r8.shaking.ProguardConfigurationParser val$parser -> a
     com.android.tools.r8.utils.Reporter val$reporter -> b
-    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):536:536 -> <init>
-    1:4:void visit(com.android.tools.r8.DataEntryResource):544:547 -> visit
+    1:1:void <init>(com.android.tools.r8.R8Command$Builder,com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.utils.Reporter):537:537 -> <init>
+    1:4:void visit(com.android.tools.r8.DataEntryResource):545:548 -> visit
     5:5:void com.android.tools.r8.shaking.ProguardConfigurationSourceBytes.<init>(java.io.InputStream,com.android.tools.r8.origin.Origin):24:24 -> visit
-    5:5:void visit(com.android.tools.r8.DataEntryResource):547 -> visit
-    6:7:void visit(com.android.tools.r8.DataEntryResource):548:549 -> visit
-    8:16:void visit(com.android.tools.r8.DataEntryResource):545:553 -> visit
-    17:17:void visit(com.android.tools.r8.DataEntryResource):550:550 -> visit
+    5:5:void visit(com.android.tools.r8.DataEntryResource):548 -> visit
+    6:7:void visit(com.android.tools.r8.DataEntryResource):549:550 -> visit
+    8:16:void visit(com.android.tools.r8.DataEntryResource):546:554 -> visit
+    17:17:void visit(com.android.tools.r8.DataEntryResource):551:551 -> visit
     18:18:void visit(com.android.tools.r8.DataEntryResource):0:0 -> visit
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":571,"2":572,"3":573}}
-    571:571:void visit(com.android.tools.r8.DataEntryResource):550:550 -> visit
-    572:572:void visit(com.android.tools.r8.DataEntryResource):550:550 -> visit
-    573:573:void visit(com.android.tools.r8.DataEntryResource):550:550 -> visit
-    568:570:void visit(com.android.tools.r8.DataEntryResource):550:550 -> visit
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":572,"2":573,"3":574}}
+    572:572:void visit(com.android.tools.r8.DataEntryResource):551:551 -> visit
+    573:573:void visit(com.android.tools.r8.DataEntryResource):551:551 -> visit
+    574:574:void visit(com.android.tools.r8.DataEntryResource):551:551 -> visit
+    569:571:void visit(com.android.tools.r8.DataEntryResource):551:551 -> visit
 com.android.tools.r8.R8Command$Builder$DefaultR8DiagnosticsHandler -> com.android.tools.r8.Q:
-    1:1:void <init>():80:80 -> <init>
-    2:2:void <init>(com.android.tools.r8.R8Command$1):80:80 -> <init>
-    1:6:void error(com.android.tools.r8.Diagnostic):84:89 -> error
-    7:14:void error(com.android.tools.r8.Diagnostic):87:94 -> error
+    1:1:void <init>():81:81 -> <init>
+    2:2:void <init>(com.android.tools.r8.R8Command$1):81:81 -> <init>
+    1:6:void error(com.android.tools.r8.Diagnostic):85:90 -> error
+    7:14:void error(com.android.tools.r8.Diagnostic):88:95 -> error
 com.android.tools.r8.R8Command$EnsureNonDexProgramResourceProvider -> com.android.tools.r8.S:
     com.android.tools.r8.ProgramResourceProvider provider -> a
-    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):676:677 -> <init>
-    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():694:694 -> getDataResourceProvider
-    1:4:java.util.Collection getProgramResources():682:685 -> getProgramResources
+    1:2:void <init>(com.android.tools.r8.ProgramResourceProvider):689:690 -> <init>
+    1:1:com.android.tools.r8.DataResourceProvider getDataResourceProvider():707:707 -> getDataResourceProvider
+    1:4:java.util.Collection getProgramResources():695:698 -> getProgramResources
 com.android.tools.r8.R8Command$StandardOutConsumer -> com.android.tools.r8.T:
-    1:1:void <init>(com.android.tools.r8.StringConsumer):1054:1054 -> <init>
-    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):1059:1060 -> accept
+    1:1:void <init>(com.android.tools.r8.StringConsumer):1067:1067 -> <init>
+    1:2:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):1072:1073 -> accept
 com.android.tools.r8.R8CommandParser -> com.android.tools.r8.V:
     java.util.Set OPTIONS_WITH_TWO_PARAMETERS -> c
     int $r8$clinit -> d
@@ -3481,13 +3491,13 @@
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.io.Writer,com.android.tools.r8.StringConsumer):192:194 -> <init>
     1:5:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):199:203 -> accept
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):209:213 -> finished
-com.android.tools.r8.StringResource -> com.android.tools.r8.internal.uZ:
+com.android.tools.r8.StringResource -> com.android.tools.r8.internal.PZ:
     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$FileResource -> com.android.tools.r8.internal.sZ:
+com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.NZ:
     java.nio.charset.Charset charset -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path file -> a
@@ -3497,7 +3507,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.tZ:
+com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.internal.OZ:
     com.android.tools.r8.origin.Origin origin -> a
     java.lang.String content -> b
     boolean $assertionsDisabled -> c
@@ -3523,7 +3533,7 @@
     25:25:java.lang.String getVersionString():21:21 -> getVersionString
     22:22: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.oW:
+com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.JW:
     java.util.Deque unassignedStack -> d
     java.util.Set unassignedSet -> c
     java.util.List components -> f
@@ -3792,23 +3802,23 @@
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.androidapi.ApiReferenceStubber):39:39 -> a
     2:2:void access$100(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):39:39 -> a
     3:3:void run(java.util.concurrent.ExecutorService):121:121 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     4:4:void run(java.util.concurrent.ExecutorService):121 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     5:5:void run(java.util.concurrent.ExecutorService):121 -> a
     6:21:void run(java.util.concurrent.ExecutorService):121:136 -> a
-    22:22:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    22:22:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     22:22:void run(java.util.concurrent.ExecutorService):136 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    23:23:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    23:23:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     23:23:void run(java.util.concurrent.ExecutorService):136 -> a
     24:26:void run(java.util.concurrent.ExecutorService):137:139 -> a
     27:29:void run(java.util.concurrent.ExecutorService):138:140 -> a
-    30:30:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    30:30:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     30:30:void run(java.util.concurrent.ExecutorService):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    31:31:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    31:31:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     31:31:void run(java.util.concurrent.ExecutorService):140 -> a
     32:35:void run(java.util.concurrent.ExecutorService):141:144 -> a
     36:44:void run(java.util.concurrent.ExecutorService):143:151 -> a
@@ -3825,7 +3835,7 @@
     100:100:com.android.tools.r8.errors.MissingGlobalSyntheticsConsumerDiagnostic lambda$mockMissingLibraryClass$3():215:215 -> a
     101:101:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$mockMissingLibraryClass$4(com.android.tools.r8.synthesis.SyntheticNaming):216:216 -> a
     102:114:void lambda$mockMissingLibraryClass$7(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):222:234 -> a
-    115:115:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> a
+    115:115:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> a
     115:115:void lambda$mockMissingLibraryClass$7(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236 -> a
     116:116:void lambda$mockMissingLibraryClass$7(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):237:237 -> a
     117:119:void lambda$mockMissingLibraryClass$6(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticMethodBuilder):227:229 -> a
@@ -3867,7 +3877,7 @@
     1:3:com.android.tools.r8.graph.DexType com.android.tools.r8.androidapi.ApiReferenceStubber$ReferencesToApiLevelUseRegistry$$InternalSyntheticOutline$166$fa4d2f1aaebefe56a72bd0d8d45ffdaa11db5a921b4ae78a58021043b9c16d22$0.m(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.h4:
+com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.j4:
     java.util.Set exceptions -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():24:24 -> <clinit>
@@ -4738,13 +4748,13 @@
     3672:3672:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):400:400 -> a
     3673:3673:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):400:400 -> a
     2989:2989:java.util.Set build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):401:401 -> a
-com.android.tools.r8.androidapi.AvailableApiExceptions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.g4:
+com.android.tools.r8.androidapi.AvailableApiExceptions$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.i4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:6:void com.android.tools.r8.androidapi.AvailableApiExceptions$$InternalSyntheticOutline$166$20e6908fb16c2dd8ad959b1c1a6646d5062d52ffebb6111c792ca6515e114c85$0.m(com.android.tools.r8.graph.DexItemFactory,java.lang.String,java.util.Set,java.lang.String,java.lang.String):0:5 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.androidapi.ComputedApiLevel -> com.android.tools.r8.internal.dd:
+com.android.tools.r8.androidapi.ComputedApiLevel -> com.android.tools.r8.internal.gd:
     int $r8$clinit -> a
     1:1:void <clinit>():15:15 -> <clinit>
     com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel asKnownApiLevel() -> F
@@ -4758,10 +4768,10 @@
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel notSet():18:18 -> q
     boolean isKnownApiLevel() -> r
     boolean isNotSetApiLevel() -> y
-com.android.tools.r8.androidapi.ComputedApiLevel$1 -> com.android.tools.r8.internal.cd:
+com.android.tools.r8.androidapi.ComputedApiLevel$1 -> com.android.tools.r8.internal.fd:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():42:42 -> <clinit>
-com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel -> com.android.tools.r8.internal.dd$a:
+com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel -> com.android.tools.r8.internal.gd$a:
     com.android.tools.r8.androidapi.ComputedApiLevel$KnownApiLevel PLATFORM_INSTANCE -> c
     com.android.tools.r8.utils.AndroidApiLevel apiLevel -> b
     1:1:void <clinit>():124:124 -> <clinit>
@@ -4773,14 +4783,14 @@
     1:1:int hashCode():166:166 -> hashCode
     boolean isKnownApiLevel() -> r
     1:1:java.lang.String toString():149:149 -> toString
-com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel -> com.android.tools.r8.internal.ed:
+com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel -> com.android.tools.r8.internal.hd:
     com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel INSTANCE -> b
     1:1:void <clinit>():75:75 -> <clinit>
     1:1:void <init>():77:77 -> <init>
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel$NotSetApiLevel access$000():73:73 -> a
     1:1:int hashCode():91:91 -> hashCode
     boolean isNotSetApiLevel() -> y
-com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel -> com.android.tools.r8.internal.fd:
+com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel -> com.android.tools.r8.internal.id:
     com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel INSTANCE -> b
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>():99:99 -> <init>
@@ -4788,22 +4798,22 @@
     1:1:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel access$100():95:95 -> a
     1:1:int hashCode():118:118 -> hashCode
     1:1:java.lang.String toString():108:108 -> toString
-com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.j5:
+com.android.tools.r8.bisect.Bisect -> com.android.tools.r8.internal.l5:
     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):78:81 -> a
     5:13:void com.android.tools.r8.bisect.Bisect.writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):184:192 -> a
     5:13: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):84 -> a
     14:22:void com.android.tools.r8.bisect.Bisect.writeApp(com.android.tools.r8.graph.DexApplication,java.nio.file.Path,java.util.concurrent.ExecutorService):191:199 -> a
     14:22: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):84 -> a
     23:29: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):85:91 -> a
-com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.j5$a:
+com.android.tools.r8.bisect.Bisect$Command -> com.android.tools.r8.internal.l5$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.k5:
+com.android.tools.r8.bisect.BisectOptions$Result -> com.android.tools.r8.internal.m5:
     com.android.tools.r8.bisect.BisectOptions$Result UNKNOWN -> b
     com.android.tools.r8.bisect.BisectOptions$Result GOOD -> c
     com.android.tools.r8.bisect.BisectOptions$Result BAD -> d
     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.o5:
+com.android.tools.r8.bisect.BisectState -> com.android.tools.r8.internal.q5:
     java.nio.file.Path stateFile -> e
     com.android.tools.r8.graph.DexApplication badApp -> b
     java.util.Map indexMap -> d
@@ -4947,7 +4957,7 @@
     18:20:void write():318 -> d
     21:23:void write():319:321 -> d
     24:24:void write():311:311 -> d
-com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.m5:
+com.android.tools.r8.bisect.BisectState$Range -> com.android.tools.r8.internal.o5:
     int end -> b
     boolean $assertionsDisabled -> c
     int start -> a
@@ -4976,20 +4986,20 @@
     193:193:java.lang.String toString():94:94 -> toString
     194:194:java.lang.String toString():94:94 -> toString
     195:195:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.bisect.BisectState$Range$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.l5:
+com.android.tools.r8.bisect.BisectState$Range$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.n5:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:java.lang.String com.android.tools.r8.bisect.BisectState$Range$$InternalSyntheticOutline$166$ce08529379ee2f531b289ce75fde83cc622d5b95d2bff129f3fff11db0ec6f8a$0.m(java.lang.StringBuilder,int,java.lang.String):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.n5:
+com.android.tools.r8.bisect.BisectState$Run -> com.android.tools.r8.internal.p5:
     boolean good -> a
     com.android.tools.r8.bisect.BisectState$Range range -> b
     boolean $assertionsDisabled -> 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.o7:
+com.android.tools.r8.cf.CfCodePrinter -> com.android.tools.r8.internal.r7:
     java.util.Map knownTypeFields -> r
     java.util.Set imports -> j
     boolean pendingComma -> p
@@ -5444,7 +5454,7 @@
     1:2:java.util.List getImports():103:104 -> i
     1:1:java.util.List getMethods():109:109 -> j
     1:1:java.util.Set getSynthesizedTypes():670:670 -> k
-com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.D8:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.G8:
     java.util.List sortedLabels -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labelToIndex -> c
     com.android.tools.r8.naming.ClassNameMapper mapper -> f
@@ -5696,7 +5706,7 @@
     1:1:void print(com.android.tools.r8.cf.code.CfReturnVoid):356:356 -> f
     1:1:void print(com.android.tools.r8.cf.code.CfArrayLength):560:560 -> g
     1:1:java.lang.String toString():819:819 -> toString
-com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.C8:
+com.android.tools.r8.cf.CfPrinter$1 -> com.android.tools.r8.internal.F8:
     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
@@ -5705,7 +5715,7 @@
     2:2:void <clinit>():676:676 -> <clinit>
     3:3:void <clinit>():319:319 -> <clinit>
     4:4:void <clinit>():275:275 -> <clinit>
-com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.G8:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.J8:
     boolean $assertionsDisabled -> n
     int maxRegisterNumber -> l
     com.android.tools.r8.graph.AppView appView -> a
@@ -5842,7 +5852,7 @@
     47:47:void com.android.tools.r8.cf.CfRegisterAllocator.updateFirstStackByJoiningTheSecond(java.util.List,java.util.List):604:604 -> b
     47:47:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):393 -> b
     1:1:com.android.tools.r8.utils.InternalOptions options():146:146 -> c
-com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.F8:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.I8:
     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>
@@ -5852,7 +5862,7 @@
     91:91:java.lang.String toString():78:78 -> toString
     92:92:java.lang.String toString():79:79 -> toString
     81:89:java.lang.String toString():80:88 -> toString
-com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.n9:
+com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.q9:
     com.android.tools.r8.cf.CfVersion V15 -> l
     boolean $assertionsDisabled -> o
     com.android.tools.r8.cf.CfVersion V17 -> m
@@ -5904,7 +5914,7 @@
     264:264:java.lang.String toString():128:128 -> toString
     265:265:java.lang.String toString():128:128 -> toString
     259:259:java.lang.String toString():128:128 -> toString
-com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.gl:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.ll:
     com.android.tools.r8.ir.code.Phi phi -> r
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
     boolean isConstant() -> L
@@ -5920,7 +5930,7 @@
     48:48:java.lang.String toString():45:45 -> toString
     49:49:java.lang.String toString():45:45 -> toString
     46:46:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.gE:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.nE:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map clonableConstants -> d
     boolean $assertionsDisabled -> f
@@ -6078,14 +6088,14 @@
     99:101: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):287:289 -> b
     99:101:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):205 -> b
     102:104:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):206:208 -> b
-com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.eE:
+com.android.tools.r8.cf.LoadStoreHelper$1 -> com.android.tools.r8.internal.lE:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():64:64 -> <clinit>
-com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.fE:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.mE:
     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):235:237 -> <init>
-com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.g30:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.C30:
     boolean computingVerificationTypes -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> e
@@ -6102,29 +6112,33 @@
     1:13:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):127:139 -> a
     14:14:boolean com.android.tools.r8.graph.DexType.isByteType():281:281 -> a
     14:14:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):140 -> a
-    15:15:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):143:143 -> a
-    16:21:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):139:144 -> a
-    22:25:com.android.tools.r8.graph.DexType getDexType(com.android.tools.r8.ir.code.Value):148:151 -> a
-    26:31:com.android.tools.r8.graph.DexType join(java.util.Set):180:185 -> a
-    32:32:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.cf.TypeVerificationHelper.toTypeElement(com.android.tools.r8.graph.DexType):219:219 -> a
-    32:32:com.android.tools.r8.graph.DexType join(java.util.Set):185 -> a
-    33:34:com.android.tools.r8.graph.DexType join(java.util.Set):186:187 -> a
-    35:35:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.cf.TypeVerificationHelper.toTypeElement(com.android.tools.r8.graph.DexType):219:219 -> a
-    35:35:com.android.tools.r8.graph.DexType join(java.util.Set):187 -> a
-    36:46:com.android.tools.r8.graph.DexType join(java.util.Set):187:197 -> a
-    47:47:com.android.tools.r8.graph.DexType join(java.util.Set):196:196 -> a
-    48:48:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    48:48:com.android.tools.r8.graph.DexType join(java.util.Set):196 -> a
-    49:49:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    49:49:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    49:49:com.android.tools.r8.graph.DexType join(java.util.Set):196 -> a
-    50:50:com.android.tools.r8.graph.DexType join(java.util.Set):196:196 -> a
-    51:74:java.util.Map computeVerificationTypes():223:246 -> a
-    75:118:java.util.Map computeVerificationTypes():245:288 -> a
-    119:121:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper.computeVerificationType(com.android.tools.r8.ir.code.Value):314:316 -> a
-    119:121:java.util.Map computeVerificationTypes():289 -> a
-    122:138:java.util.Map computeVerificationTypes():291:307 -> a
-    139:144:void addUsers(com.android.tools.r8.ir.code.Value,java.util.Set):320:325 -> a
+    15:15:boolean com.android.tools.r8.graph.DexType.isCharType():285:285 -> a
+    15:15:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):141 -> a
+    16:16:boolean com.android.tools.r8.graph.DexType.isShortType():289:289 -> a
+    16:16:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):142 -> a
+    17:17:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):143:143 -> a
+    18:23:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo createInitializedType(com.android.tools.r8.graph.DexType):139:144 -> a
+    24:27:com.android.tools.r8.graph.DexType getDexType(com.android.tools.r8.ir.code.Value):148:151 -> a
+    28:33:com.android.tools.r8.graph.DexType join(java.util.Set):180:185 -> a
+    34:34:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.cf.TypeVerificationHelper.toTypeElement(com.android.tools.r8.graph.DexType):219:219 -> a
+    34:34:com.android.tools.r8.graph.DexType join(java.util.Set):185 -> a
+    35:36:com.android.tools.r8.graph.DexType join(java.util.Set):186:187 -> a
+    37:37:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.cf.TypeVerificationHelper.toTypeElement(com.android.tools.r8.graph.DexType):219:219 -> a
+    37:37:com.android.tools.r8.graph.DexType join(java.util.Set):187 -> a
+    38:48:com.android.tools.r8.graph.DexType join(java.util.Set):187:197 -> a
+    49:49:com.android.tools.r8.graph.DexType join(java.util.Set):196:196 -> a
+    50:50:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    50:50:com.android.tools.r8.graph.DexType join(java.util.Set):196 -> a
+    51:51:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    51:51:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    51:51:com.android.tools.r8.graph.DexType join(java.util.Set):196 -> a
+    52:52:com.android.tools.r8.graph.DexType join(java.util.Set):196:196 -> a
+    53:76:java.util.Map computeVerificationTypes():223:246 -> a
+    77:120:java.util.Map computeVerificationTypes():245:288 -> a
+    121:123:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper.computeVerificationType(com.android.tools.r8.ir.code.Value):314:316 -> a
+    121:123:java.util.Map computeVerificationTypes():289 -> a
+    124:140:java.util.Map computeVerificationTypes():291:307 -> a
+    141:146:void addUsers(com.android.tools.r8.ir.code.Value,java.util.Set):320:325 -> a
     1:19:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):155:173 -> b
     20:20:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":208,"2":209,"3":210}}
@@ -6137,10 +6151,10 @@
     196:196:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):167:167 -> b
     197:197:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):165:165 -> b
     198:198: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.b30:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.x30:
     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.c30:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.y30:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():41:41 -> <clinit>
@@ -6148,7 +6162,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.d30:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.z30:
     com.android.tools.r8.ir.code.NewInstance newInstance -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():60:60 -> <clinit>
@@ -6162,7 +6176,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.e30:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.A30:
     com.android.tools.r8.ir.code.Argument thisArgument -> b
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> c
@@ -6177,9 +6191,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.f30:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.B30:
     com.android.tools.r8.graph.DexType getDexType() -> a
-com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.V6:
+com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.X6:
     com.android.tools.r8.ir.code.NumericType type -> d
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
@@ -6219,22 +6233,22 @@
     227:227:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):185:185 -> a
     228:228:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):182:182 -> a
     246:247:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):215:216 -> a
-    248:248:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):142:142 -> a
+    248:248:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):143:143 -> a
     248:248:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):216 -> a
     249:250:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):216:217 -> a
-    251:251:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):142:142 -> a
+    251:251:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):143:143 -> a
     251:251:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):217 -> a
     252:253:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):217:218 -> a
-    254:254:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):282:282 -> a
+    254:254:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):283:283 -> a
     254:254:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):218 -> a
     1:1:boolean canThrow():171:171 -> r
     1:1:int getCompareToId():52:52 -> t
-com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.U6:
+com.android.tools.r8.cf.code.CfArithmeticBinop$1 -> com.android.tools.r8.internal.W6:
     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>():134:134 -> <clinit>
     2:2:void <clinit>():117:117 -> <clinit>
-com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.V6$a:
+com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.X6$a:
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] $VALUES -> g
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Add -> b
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Rem -> f
@@ -6245,7 +6259,7 @@
     6:6:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(java.lang.String,int):32:32 -> <init>
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] values():32:32 -> a
-com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.W6:
+com.android.tools.r8.cf.code.CfArrayLength -> com.android.tools.r8.internal.Y6:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():28:28 -> <init>
@@ -6256,173 +6270,198 @@
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):73:73 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayLength():82:82 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):80 -> a
-    10:12:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):91:93 -> a
+    10:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):91:91 -> a
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.X6:
-    com.android.tools.r8.ir.code.MemberType type -> c
-    boolean $assertionsDisabled -> d
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.code.MemberType):35:37 -> <init>
-    1:19:int getLoadType():56:74 -> H
-    20:20:int getLoadType():0:0 -> H
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":95,"2":96,"3":97}}
-    95:95:int getLoadType():74:74 -> H
-    96:96:int getLoadType():74:74 -> H
-    97:97:int getLoadType():74:74 -> H
-    94:94:int getLoadType():74:74 -> H
-    1:1:com.android.tools.r8.ir.code.MemberType getType():52:52 -> I
-    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
+com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.Z6:
+    boolean $assertionsDisabled -> e
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.MemberType):32:32 -> <init>
+    1:19:int getLoadType():41:59 -> I
+    20:20:int getLoadType():0:0 -> I
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":80,"2":81,"3":82}}
+    80:80:int getLoadType():59:59 -> I
+    81:81:int getLoadType():59:59 -> I
+    82:82:int getLoadType():59:59 -> I
+    79:79:int getLoadType():59:59 -> I
+    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):73:73 -> a
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayGet():78:78 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):125 -> 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):88:88 -> a
-    4:4:void print(com.android.tools.r8.cf.CfPrinter):98:98 -> a
-    5:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):108:112 -> a
-    10:28:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):59:77 -> a
-    10:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112 -> a
-    29:29:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):75:75 -> a
-    29:29:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112 -> a
-    30:30:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):70:70 -> a
-    30:30:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112 -> a
-    31:31:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):68:68 -> a
-    31:31:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112 -> a
-    32:32:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):66:66 -> a
-    32:32:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112 -> a
-    33:41:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):64:72 -> a
-    33:41:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):112 -> a
-    42:48:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):113:119 -> a
-    49:52:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):136:139 -> a
-    53:53:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.MemberType):276:276 -> a
-    53:53:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):139 -> a
-    boolean canThrow() -> r
-    1:1:int getCompareToId():42:42 -> t
-com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.Y6:
+    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):100 -> a
+    3:3:void print(com.android.tools.r8.cf.CfPrinter):78:78 -> a
+    4:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):83:87 -> a
+    9:27:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):59:77 -> a
+    9:27:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):87 -> a
+    28:28:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):75:75 -> a
+    28:28:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):87 -> a
+    29:29:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):70:70 -> a
+    29:29:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):87 -> a
+    30:30:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):68:68 -> a
+    30:30:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):87 -> a
+    31:31:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):66:66 -> a
+    31:31:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):87 -> a
+    32:40:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.ValueType.fromMemberType(com.android.tools.r8.ir.code.MemberType):64:72 -> a
+    32:40:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):87 -> a
+    41:47:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):88:94 -> a
+    48:52:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):111:115 -> a
+    53:53:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):113:113 -> a
+    54:55:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):117:118 -> a
+    56:56:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.MemberType):277:277 -> a
+    56:56:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):118 -> a
+    57:59:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):121:123 -> a
+    60:60:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):119:119 -> a
+    1:1:int getCompareToId():37:37 -> t
+com.android.tools.r8.cf.code.CfArrayLoadOrStore -> com.android.tools.r8.internal.a7:
     com.android.tools.r8.ir.code.MemberType type -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.ir.code.MemberType):34:36 -> <init>
-    1:19:int getStoreType():55:73 -> H
-    20:20:int getStoreType():0:0 -> H
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":94,"2":95,"3":96}}
-    94:94:int getStoreType():73:73 -> H
-    95:95:int getStoreType():73:73 -> H
-    96:96:int getStoreType():73:73 -> H
-    93:93:int getStoreType():73:73 -> H
-    1:1:com.android.tools.r8.ir.code.MemberType getType():40:40 -> I
-    1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):51:51 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayPut():86:86 -> a
-    2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):116 -> 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):87:87 -> a
-    4:4:void print(com.android.tools.r8.cf.CfPrinter):97:97 -> a
-    5:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):107:110 -> a
-    9:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):127:128 -> a
-    11:15:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.MemberType):134:138 -> a
-    11:15:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):128 -> a
-    16:16:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.MemberType):135:135 -> a
-    16:16:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):128 -> a
-    17:19:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):128:130 -> a
+    1:1:void <clinit>():14:14 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.ir.code.MemberType):18:20 -> <init>
+    1:1:com.android.tools.r8.ir.code.MemberType getType():57:57 -> H
+    1:19:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):34:52 -> a
+    20:20:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":96,"2":97,"3":98}}
+    96:96:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):52:52 -> a
+    97:97:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):52:52 -> a
+    98:98:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):52:52 -> a
+    72:72:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):52:52 -> a
+    73:73:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):50:50 -> a
+    74:74:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):48:48 -> a
+    75:75:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):46:46 -> a
+    76:76:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):44:44 -> a
+    77:77:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):42:42 -> a
+    78:78:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):40:40 -> a
+    79:79:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):38:38 -> a
+    80:80:com.android.tools.r8.graph.DexType getExpectedArrayType(com.android.tools.r8.graph.DexItemFactory):36:36 -> a
+    99:99:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):63:63 -> a
     boolean canThrow() -> r
-    1:1:int getCompareToId():45:45 -> t
-com.android.tools.r8.cf.code.CfAssignability -> com.android.tools.r8.internal.c7:
+com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.b7:
+    1:1:void <init>(com.android.tools.r8.ir.code.MemberType):31:31 -> <init>
+    1:19:int getStoreType():40:58 -> I
+    20:20:int getStoreType():0:0 -> I
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":79,"2":80,"3":81}}
+    79:79:int getStoreType():58:58 -> I
+    80:80:int getStoreType():58:58 -> I
+    81:81:int getStoreType():58:58 -> I
+    78:78:int getStoreType():58:58 -> I
+    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):72:72 -> a
+    2:2:void print(com.android.tools.r8.cf.CfPrinter):77:77 -> a
+    3:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):82:85 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forArrayPut():86:86 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):91 -> a
+    8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):103:103 -> a
+    9:13:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.MemberType):135:139 -> a
+    9:13:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):103 -> a
+    14:14:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.MemberType):136:136 -> a
+    14:14:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):103 -> a
+    15:17:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):103:105 -> a
+    1:1:int getCompareToId():36:36 -> t
+com.android.tools.r8.cf.code.CfAssignability -> com.android.tools.r8.internal.f7:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:5:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):26:30 -> a
-    6:6:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):37:37 -> a
-    6:6:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):30 -> a
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:5:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):25:29 -> a
+    6:6:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):36:36 -> a
+    6:6:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):29 -> a
     7:7:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isOneWord():0:0 -> a
-    7:7:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):37 -> a
-    7:7:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):30 -> a
-    8:8:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):40:40 -> a
-    8:8:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):30 -> a
+    7:7:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):36 -> a
+    7:7:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):29 -> a
+    8:8:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):39:39 -> a
+    8:8:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):29 -> a
     9:9:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isOneWord():0:0 -> a
-    9:9:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):40 -> a
-    9:9:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):30 -> a
+    9:9:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):39 -> a
+    9:9:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):29 -> a
     10:10:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isUninitializedNew():0:0 -> a
-    10:10:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):43 -> a
-    10:10:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):30 -> a
-    11:32:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):45:66 -> a
-    11:32:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):30 -> a
-    33:38:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):64:69 -> a
-    33:38:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):30 -> a
-    39:39:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):31:31 -> a
-    40:40:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.frame.WideFrameType):75:75 -> a
+    10:10:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):42 -> a
+    10:10:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):29 -> a
+    11:32:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):44:65 -> a
+    11:32:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):29 -> a
+    33:38:boolean com.android.tools.r8.cf.code.CfAssignability.isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.graph.AppView):63:68 -> a
+    33:38:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):29 -> a
+    39:39:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.AppView):30:30 -> a
+    40:40:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.frame.WideFrameType):74:74 -> a
     41:41:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isTwoWord():0:0 -> a
-    41:41:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.frame.WideFrameType):75 -> a
-    42:42:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.frame.WideFrameType):75:75 -> a
+    41:41:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.frame.WideFrameType):74 -> a
+    42:42:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.frame.WideFrameType):74:74 -> a
     43:43:boolean com.android.tools.r8.cf.code.frame.WideFrameType.lessThanOrEqualTo(com.android.tools.r8.cf.code.frame.WideFrameType):11:11 -> a
-    43:43:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.frame.WideFrameType):76 -> a
+    43:43:boolean isFrameTypeAssignable(com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.frame.WideFrameType):75 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    44:44:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):81:81 -> a
-    45:45:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):120:120 -> a
-    45:45:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):116 -> a
-    45:45:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):82 -> a
-    46:46:boolean com.android.tools.r8.graph.DexType.isByteType():281:281 -> a
-    46:46:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):121 -> a
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):116 -> a
+    44:45:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):80:81 -> a
+    46:46:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):127:127 -> a
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123 -> a
     46:46:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):82 -> a
-    47:47:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):123:123 -> a
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):116 -> a
+    47:47:boolean com.android.tools.r8.graph.DexType.isByteType():281:281 -> a
+    47:47:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):128 -> a
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123 -> a
     47:47:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):82 -> a
-    48:48:boolean com.android.tools.r8.graph.DexType.isShortType():289:289 -> a
-    48:48:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):124 -> a
-    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):116 -> a
+    48:48:boolean com.android.tools.r8.graph.DexType.isCharType():285:285 -> a
+    48:48:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):129 -> a
+    48:48:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123 -> a
     48:48:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):82 -> a
-    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):116:116 -> a
+    49:49:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):130:130 -> a
+    49:49:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123 -> a
     49:49:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):82 -> a
-    50:50:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):120:120 -> a
-    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):116 -> a
-    50:50:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):83 -> a
-    51:51:boolean com.android.tools.r8.graph.DexType.isByteType():281:281 -> a
-    51:51:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):121 -> a
-    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):116 -> a
-    51:51:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):83 -> a
-    52:52:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):123:123 -> a
-    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):116 -> a
+    50:50:boolean com.android.tools.r8.graph.DexType.isShortType():289:289 -> a
+    50:50:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):131 -> a
+    50:50:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123 -> a
+    50:50:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):82 -> a
+    51:51:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123:123 -> a
+    51:51:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):82 -> a
+    52:52:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):127:127 -> a
+    52:52:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123 -> a
     52:52:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):83 -> a
-    53:53:boolean com.android.tools.r8.graph.DexType.isShortType():289:289 -> a
-    53:53:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):124 -> a
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):116 -> a
+    53:53:boolean com.android.tools.r8.graph.DexType.isByteType():281:281 -> a
+    53:53:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):128 -> a
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123 -> a
     53:53:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):83 -> a
-    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):116:116 -> a
+    54:54:boolean com.android.tools.r8.graph.DexType.isCharType():285:285 -> a
+    54:54:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):129 -> a
+    54:54:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123 -> a
     54:54:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):83 -> a
-    55:72:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):87:104 -> a
-    73:77:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):103:107 -> a
-    78:81:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):141:144 -> a
-    82:82:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":416,"2":417,"3":418}}
-    416:416:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):144:144 -> a
-    417:417:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):144:144 -> a
-    418:418:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):144:144 -> a
-    228:241:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):146:159 -> a
-    242:242:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":433,"2":434,"3":435}}
-    433:433:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):159:159 -> a
-    434:434:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):159:159 -> a
-    435:435:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):159:159 -> a
-    403:415:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):161:173 -> a
-    436:437:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):180:181 -> a
-    438:438:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":841,"2":842,"3":843}}
-    841:841:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):181:181 -> a
-    842:842:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):181:181 -> a
-    843:843:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):181:181 -> a
-    621:631:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):183:193 -> a
-    632:632:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":855,"2":856,"3":857}}
-    855:855:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):193:193 -> a
-    856:856:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):193:193 -> a
-    857:857:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):193:193 -> a
-    827:840:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):195:208 -> a
-com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult -> com.android.tools.r8.internal.Z6:
-    1:1:void <init>():211:211 -> <init>
+    55:55:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):130:130 -> a
+    55:55:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123 -> a
+    55:55:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):83 -> a
+    56:56:boolean com.android.tools.r8.graph.DexType.isShortType():289:289 -> a
+    56:56:boolean com.android.tools.r8.cf.code.CfAssignability.hasIntVerificationType(com.android.tools.r8.graph.DexType):131 -> a
+    56:56:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123 -> a
+    56:56:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):83 -> a
+    57:57:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfAssignability.byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):123:123 -> a
+    57:57:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):83 -> a
+    58:75:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):87:104 -> a
+    76:85:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):103:112 -> a
+    86:89:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):148:151 -> a
+    90:90:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":438,"2":439,"3":440}}
+    438:438:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):151:151 -> a
+    439:439:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):151:151 -> a
+    440:440:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):151:151 -> a
+    243:256:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):153:166 -> a
+    257:257:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":455,"2":456,"3":457}}
+    455:455:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):166:166 -> a
+    456:456:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):166:166 -> a
+    457:457:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):166:166 -> a
+    425:437:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isLocalsAssignable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.graph.AppView):168:180 -> a
+    458:459:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):187:188 -> a
+    460:460:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":877,"2":878,"3":879}}
+    877:877:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):188:188 -> a
+    878:878:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):188:188 -> a
+    879:879:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):188:188 -> a
+    650:660:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):190:200 -> a
+    661:661:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":891,"2":892,"3":893}}
+    891:891:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):200:200 -> a
+    892:892:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):200:200 -> a
+    893:893:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):200:200 -> a
+    863:876:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult isStackAssignable(java.util.Deque,java.util.Deque,com.android.tools.r8.graph.AppView):202:215 -> a
+com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult -> com.android.tools.r8.internal.c7:
+    1:1:void <init>():218:218 -> <init>
     com.android.tools.r8.cf.code.CfAssignability$FailedAssignabilityResult asFailed() -> a
-com.android.tools.r8.cf.code.CfAssignability$FailedAssignabilityResult -> com.android.tools.r8.internal.a7:
+com.android.tools.r8.cf.code.CfAssignability$FailedAssignabilityResult -> com.android.tools.r8.internal.d7:
     java.lang.String message -> a
-    1:2:void <init>(java.lang.String):238:239 -> <init>
+    1:2:void <init>(java.lang.String):245:246 -> <init>
     com.android.tools.r8.cf.code.CfAssignability$FailedAssignabilityResult asFailed() -> a
-    1:1:java.lang.String getMessage():243:243 -> b
-com.android.tools.r8.cf.code.CfAssignability$SuccessfulAssignabilityResult -> com.android.tools.r8.internal.b7:
-    1:1:void <init>():226:226 -> <init>
-com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.f7:
+    1:1:java.lang.String getMessage():250:250 -> b
+com.android.tools.r8.cf.code.CfAssignability$SuccessfulAssignabilityResult -> com.android.tools.r8.internal.e7:
+    1:1:void <init>():233:233 -> <init>
+com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.i7:
     com.android.tools.r8.graph.DexType type -> c
     boolean ignoreCompatRules -> d
     1:1:void <init>(com.android.tools.r8.graph.DexType):38:38 -> <init>
@@ -6448,7 +6487,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> q
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.m7:
+com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.p7:
     com.android.tools.r8.ir.code.Cmp$Bias bias -> c
     com.android.tools.r8.ir.code.NumericType type -> d
     boolean $assertionsDisabled -> e
@@ -6472,17 +6511,17 @@
     4: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):111:111 -> a
     5:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):121:123 -> a
     8:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):140:141 -> a
-    10:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):142:142 -> a
+    10:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):143:143 -> a
     10:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):141 -> a
     11:12:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):141:142 -> a
-    13:13:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):142:142 -> a
+    13:13:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):143:143 -> a
     13:13:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):142 -> a
     14:15:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):142:143 -> a
     1:1:int getCompareToId():49:49 -> t
-com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.l7:
+com.android.tools.r8.cf.code.CfCmp$1 -> com.android.tools.r8.internal.o7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():84:84 -> <clinit>
-com.android.tools.r8.cf.code.CfConditionalJumpInstruction -> com.android.tools.r8.internal.q7:
+com.android.tools.r8.cf.code.CfConditionalJumpInstruction -> com.android.tools.r8.internal.t7:
     com.android.tools.r8.ir.code.If$Type kind -> c
     com.android.tools.r8.ir.code.ValueType type -> d
     com.android.tools.r8.cf.code.CfLabel target -> e
@@ -6495,7 +6534,7 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):35 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():54:54 -> u
     boolean isConditionalJump() -> v
-com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.s7:
+com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.v7:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType type -> c
     boolean ignoreCompatRules -> d
@@ -6555,13 +6594,13 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> q
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfConstClass$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.r7:
+com.android.tools.r8.cf.code.CfConstClass$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.u7:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.String com.android.tools.r8.cf.code.CfConstClass$$InternalSyntheticOutline$166$37c66abd9d2a2dc03f27fba98790669ca793ab689546056e468f3d38bbb416c6$0.m(java.lang.String,com.android.tools.r8.graph.DexType):0:4 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.t7:
+com.android.tools.r8.cf.code.CfConstDynamic -> com.android.tools.r8.internal.w7:
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> c
     int $r8$clinit -> e
     boolean $assertionsDisabled -> d
@@ -6579,7 +6618,7 @@
     4:4:com.android.tools.r8.graph.DexString com.android.tools.r8.cf.code.CfConstDynamic.getName():75:75 -> a
     4:4:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):147 -> a
     5:5:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):147:147 -> a
-    6:6:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
+    6:6:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):69:69 -> a
     6:6:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):147 -> a
     7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfConstDynamic.getType():171:171 -> a
     7:7:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):151 -> a
@@ -6616,7 +6655,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> q
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.u7:
+com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.x7:
     com.android.tools.r8.graph.DexMethodHandle handle -> c
     1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):35:36 -> <init>
     1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():40:40 -> H
@@ -6636,7 +6675,7 @@
     26:26:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):102 -> a
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.v7:
+com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.y7:
     com.android.tools.r8.graph.DexProto type -> c
     1:2:void <init>(com.android.tools.r8.graph.DexProto):35:36 -> <init>
     1:1:com.android.tools.r8.graph.DexProto getType():40:40 -> H
@@ -6660,7 +6699,7 @@
     28:28:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):100 -> a
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.w7:
+com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.z7:
     1:1:void <init>():28:28 -> <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):40:40 -> 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):56:56 -> a
@@ -6672,7 +6711,7 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():106:106 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):72 -> a
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.y7:
+com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.B7:
     com.android.tools.r8.ir.code.ValueType type -> d
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
@@ -6716,18 +6755,18 @@
     287:287:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):240 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     288:289:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):240:241 -> a
-    290:290:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.ValueType):287:287 -> a
+    290:290:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.ValueType):288:288 -> a
     290:290:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):241 -> a
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.x7:
+com.android.tools.r8.cf.code.CfConstNumber$1 -> com.android.tools.r8.internal.A7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():94:94 -> <clinit>
-com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.z7:
+com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.C7:
     com.android.tools.r8.graph.DexString string -> c
     1:2:void <init>(com.android.tools.r8.graph.DexString):31:32 -> <init>
     1:1:com.android.tools.r8.graph.DexString getString():47:47 -> H
     1:1:int internalAcceptCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.utils.structural.CompareToVisitor,com.android.tools.r8.graph.CfCompareHelper):43:43 -> a
-    2:2:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
+    2:2:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):69:69 -> 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):43 -> a
     3:3:void setString(com.android.tools.r8.graph.DexString):51:51 -> a
     4: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):74:74 -> a
@@ -6741,7 +6780,7 @@
     com.android.tools.r8.cf.code.CfConstString asConstString() -> d
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.A7:
+com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.D7:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
     com.android.tools.r8.graph.DexReference item -> c
@@ -6765,7 +6804,7 @@
     com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> e
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.B7:
+com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.E7:
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
     com.android.tools.r8.graph.DexField declaringField -> d
@@ -6793,7 +6832,7 @@
     boolean canThrow() -> r
     1:1:int getCompareToId():71:71 -> t
     boolean isFieldInstruction() -> w
-com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.C7:
+com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.F7:
     java.util.Deque stack -> d
     java.util.Deque EMPTY_STACK -> e
     boolean $assertionsDisabled -> f
@@ -6838,7 +6877,7 @@
     int getCompareToId() -> t
     1:1:java.lang.String toString():252:252 -> toString
     boolean isFrame() -> x
-com.android.tools.r8.cf.code.CfFrame$Builder -> com.android.tools.r8.internal.C7$a:
+com.android.tools.r8.cf.code.CfFrame$Builder -> com.android.tools.r8.internal.F7$a:
     java.util.Deque stack -> b
     boolean $assertionsDisabled -> e
     boolean hasIncompleteUninitializedNew -> c
@@ -6878,7 +6917,7 @@
     1:1:boolean hasIncompleteUninitializedNew():359:359 -> c
     2:2:boolean hasLocal(int):368:368 -> c
     1:1:com.android.tools.r8.cf.code.CfFrame$Builder setHasIncompleteUninitializedNew():363:363 -> d
-com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.E7:
+com.android.tools.r8.cf.code.CfFrameVerificationHelper -> com.android.tools.r8.internal.H7:
     com.android.tools.r8.graph.ProgramMethod method -> e
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> a
@@ -6889,59 +6928,59 @@
     java.util.Deque currentCatchRanges -> i
     java.util.Map stateMap -> g
     com.android.tools.r8.graph.GraphLens codeLens -> c
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.List):51:51 -> <init>
-    2:24:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.List):43:65 -> <init>
-    1:2:boolean isImmediateSuperClassOfCurrentContext(com.android.tools.r8.graph.DexType):88:89 -> a
-    3:9:void seenLabel(com.android.tools.r8.cf.code.CfLabel):99:105 -> a
-    10:10:boolean lambda$seenLabel$0(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfTryCatch):105:105 -> a
-    11:11:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():110:110 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.List):52:52 -> <init>
+    2:25:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.List):43:66 -> <init>
+    1:2:boolean isImmediateSuperClassOfCurrentContext(com.android.tools.r8.graph.DexType):89:90 -> a
+    3:9:void seenLabel(com.android.tools.r8.cf.code.CfLabel):100:106 -> a
+    10:10:boolean lambda$seenLabel$0(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfTryCatch):106:106 -> a
+    11:11:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():111:111 -> a
     12:12:java.util.List com.android.tools.r8.cf.code.CfTryCatch.getTargets():45:45 -> a
-    12:12:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):126 -> a
+    12:12:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):127 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:12:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():111 -> a
-    13:22:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):126:135 -> a
-    13:22:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():111 -> a
+    12:12:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():112 -> a
+    13:22:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):127:136 -> a
+    13:22:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():112 -> a
     23:23:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38,"2":39,"3":40}}
-    38:38:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):135:135 -> a
-    38:38:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():111 -> a
-    39:39:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):135:135 -> a
-    39:39:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():111 -> a
-    40:40:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):135:135 -> a
-    40:40:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():111 -> a
-    24:24:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):138:138 -> a
-    24:24:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():111 -> a
-    25:33:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):135:143 -> a
-    25:33:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():111 -> a
+    38:38:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):136:136 -> a
+    38:38:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():112 -> a
+    39:39:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):136:136 -> a
+    39:39:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():112 -> a
+    40:40:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):136:136 -> a
+    40:40:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():112 -> a
+    24:24:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):139:139 -> a
+    24:24:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():112 -> a
+    25:33:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):136:144 -> a
+    25:33:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():112 -> a
     34:34:boolean com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult.isFailed():0:0 -> a
-    34:34:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):144 -> a
-    34:34:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():111 -> a
-    35:37:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):145:145 -> a
-    35:37:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():111 -> a
-    41:41:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkExceptionEdges(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):154:154 -> a
+    34:34:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):145 -> a
+    34:34:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():112 -> a
+    35:37:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.cf.code.CfFrameVerificationHelper.checkTryCatchRange(com.android.tools.r8.cf.code.CfTryCatch):146:146 -> a
+    35:37:com.android.tools.r8.graph.CfCodeDiagnostics checkTryCatchRanges():112 -> a
+    41:41:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkExceptionEdges(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):155:155 -> a
     42:42:java.util.List com.android.tools.r8.cf.code.CfTryCatch.getTargets():45:45 -> a
-    42:42:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkExceptionEdges(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):155 -> a
+    42:42:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkExceptionEdges(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):156 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    43:48:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkExceptionEdges(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):155:160 -> a
-    49:49:com.android.tools.r8.cf.code.CfFrame com.android.tools.r8.cf.code.CfFrameVerificationHelper.getDestinationFrame(com.android.tools.r8.cf.code.CfLabel):174:174 -> a
-    49:49:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkTarget(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.CfLabel):167 -> a
-    50:51:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkTarget(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.CfLabel):169:170 -> a
-    52:59:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):179:186 -> a
+    43:48:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkExceptionEdges(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):156:161 -> a
+    49:49:com.android.tools.r8.cf.code.CfFrame com.android.tools.r8.cf.code.CfFrameVerificationHelper.getDestinationFrame(com.android.tools.r8.cf.code.CfLabel):175:175 -> a
+    49:49:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkTarget(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.CfLabel):168 -> a
+    50:51:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkTarget(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.CfLabel):170:171 -> a
+    52:59:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):180:187 -> a
     60:60:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    60:60:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):186 -> a
-    61:70:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):187:196 -> a
+    60:60:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):187 -> a
+    61:70:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):188:197 -> a
     71:71:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    71:71:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):197 -> a
-    72:72:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):198:198 -> a
-    73:73:com.android.tools.r8.cf.code.CfFrame com.android.tools.r8.cf.code.CfFrameVerificationHelper.getDestinationFrame(com.android.tools.r8.cf.code.CfLabel):174:174 -> a
-    73:73:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):198 -> a
-    74:79:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):201:206 -> a
-    80:87:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):202:209 -> a
-    88:88:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):208:208 -> a
-    1:1:com.android.tools.r8.graph.DexMethod getCurrentContext():71:71 -> b
-    1:1:int getMaxLocals():76:76 -> c
-    1:1:int getMaxStack():81:81 -> d
-com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.F7:
+    71:71:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):198 -> a
+    72:72:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):199:199 -> a
+    73:73:com.android.tools.r8.cf.code.CfFrame com.android.tools.r8.cf.code.CfFrameVerificationHelper.getDestinationFrame(com.android.tools.r8.cf.code.CfLabel):175:175 -> a
+    73:73:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):199 -> a
+    74:79:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):202:207 -> a
+    80:87:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):203:210 -> a
+    88:88:com.android.tools.r8.utils.TraversalContinuation computeStateForNextInstruction(com.android.tools.r8.cf.code.CfInstruction,int,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):209:209 -> a
+    1:1:com.android.tools.r8.graph.DexMethod getCurrentContext():72:72 -> b
+    1:1:int getMaxLocals():77:77 -> c
+    1:1:int getMaxStack():82:82 -> d
+com.android.tools.r8.cf.code.CfGoto -> com.android.tools.r8.internal.I7:
     com.android.tools.r8.cf.code.CfLabel target -> c
     1:2:void <init>(com.android.tools.r8.cf.code.CfLabel):33:34 -> <init>
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory) -> a
@@ -6959,7 +6998,7 @@
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):107 -> a
     int getCompareToId() -> t
     1:1:com.android.tools.r8.cf.code.CfLabel getTarget():65:65 -> u
-com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.H7:
+com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.K7:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):32:32 -> <init>
@@ -6989,10 +7028,10 @@
     17:17:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):100 -> a
     18:18:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):111:111 -> a
     1:1:int getCompareToId():37:37 -> t
-com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.G7:
+com.android.tools.r8.cf.code.CfIf$1 -> com.android.tools.r8.internal.J7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():60:60 -> <clinit>
-com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.J7:
+com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.M7:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.cf.code.CfLabel):32:32 -> <init>
@@ -7022,10 +7061,10 @@
     18:18:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):102 -> a
     19:19:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):113:113 -> a
     1:1:int getCompareToId():37:37 -> t
-com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.I7:
+com.android.tools.r8.cf.code.CfIfCmp$1 -> com.android.tools.r8.internal.L7:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():60:60 -> <clinit>
-com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.K7:
+com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.N7:
     int increment -> d
     int var -> c
     1:3:void <init>(int,int):40:42 -> <init>
@@ -7041,7 +7080,7 @@
     7:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):90:91 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):97:97 -> a
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.L7:
+com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.O7:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):37:38 -> <init>
     1:1:com.android.tools.r8.graph.DexType getClassValue():42:42 -> H
@@ -7059,7 +7098,7 @@
     15:15:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):126:126 -> a
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfInstanceFieldRead -> com.android.tools.r8.internal.M7:
+com.android.tools.r8.cf.code.CfInstanceFieldRead -> com.android.tools.r8.internal.P7:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):33:33 -> <init>
     int getOpcode() -> I
     1:1:com.android.tools.r8.cf.code.CfFieldInstruction createWithField(com.android.tools.r8.graph.DexField):48:48 -> a
@@ -7069,7 +7108,7 @@
     4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):59:60 -> a
     6:6:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):66:66 -> a
     7:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):78:79 -> a
-com.android.tools.r8.cf.code.CfInstanceFieldWrite -> com.android.tools.r8.internal.N7:
+com.android.tools.r8.cf.code.CfInstanceFieldWrite -> com.android.tools.r8.internal.Q7:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):36:36 -> <init>
     int getOpcode() -> I
     1:1:com.android.tools.r8.cf.code.CfFieldInstruction createWithField(com.android.tools.r8.graph.DexField):41:41 -> a
@@ -7093,7 +7132,7 @@
     15:17:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):82 -> a
     18:18:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.cf.code.CfInstanceFieldWrite.error(com.android.tools.r8.cf.code.frame.PreciseFrameType):86:86 -> a
     18:18:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):82 -> a
-com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.O7:
+com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.R7:
     com.android.tools.r8.graph.DexType type -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):35:36 -> <init>
     boolean isTypeInstruction() -> G
@@ -7115,7 +7154,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> q
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.P7:
+com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.S7:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():36:36 -> <clinit>
     1:1:void <init>():36:36 -> <init>
@@ -7166,7 +7205,7 @@
     boolean isFrame() -> x
     boolean isInvoke() -> y
     boolean isInvokeInterface() -> z
-com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.V7:
+com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.Y7:
     boolean itf -> e
     boolean $assertionsDisabled -> f
     int opcode -> d
@@ -7293,23 +7332,23 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1024:1025:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):287:288 -> a
     1026:1026:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):277:277 -> a
-    1027:1027:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):344:344 -> a
+    1027:1027:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):348:348 -> a
     1027:1027:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):277 -> a
     1028:1028:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2929:2929 -> a
-    1028:1028:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):344 -> a
+    1028:1028:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):348 -> a
     1028:1028:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):277 -> a
-    1029:1034:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):345:350 -> a
+    1029:1034:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):349:354 -> a
     1029:1034:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):277 -> a
-    1035:1036:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):355:356 -> a
-    1035:1036:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):350 -> a
+    1035:1036:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):359:360 -> a
+    1035:1036:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):354 -> a
     1035:1036:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):277 -> a
     1037:1037:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):455:455 -> a
-    1037:1037:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):356 -> a
+    1037:1037:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):360 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1037:1037:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):350 -> a
+    1037:1037:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):354 -> a
     1037:1037:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):277 -> a
-    1038:1053:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):357:372 -> a
-    1038:1053:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):350 -> a
+    1038:1053:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):361:376 -> a
+    1038:1053:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.computeInvokeTypeForInvokeSpecial(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):354 -> a
     1038:1053:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):277 -> a
     1054:1054:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):278:278 -> a
     1055:1055:com.android.tools.r8.graph.GraphLens$MethodLookupResult com.android.tools.r8.graph.GraphLens.lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):455:455 -> a
@@ -7342,13 +7381,13 @@
     1115:1115:com.android.tools.r8.graph.DexType[] com.android.tools.r8.graph.DexTypeList.getBacking():63:63 -> a
     1115:1115:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):329 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1116:1126:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):329:339 -> a
+    1116:1130:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):329:343 -> a
     com.android.tools.r8.cf.code.CfInvoke asInvoke() -> i
     boolean canThrow() -> r
     1:1:int getCompareToId():65:65 -> t
     boolean isInvoke() -> y
     1:1:boolean isInvokeInterface():176:176 -> z
-com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.W7:
+com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.Z7:
     com.android.tools.r8.graph.DexCallSite callSite -> c
     1:2:void <init>(com.android.tools.r8.graph.DexCallSite):45:46 -> <init>
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():132:132 -> H
@@ -7407,7 +7446,7 @@
     com.android.tools.r8.cf.code.CfInvokeDynamic asInvokeDynamic() -> j
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.X7:
+com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.a8:
     int local -> c
     1:2:void <init>(int):36:37 -> <init>
     1:1:int getLocal():95:95 -> H
@@ -7468,12 +7507,12 @@
     3:3:int getCompareToId():42 -> t
     4:4:com.android.tools.r8.errors.CompilationError com.android.tools.r8.cf.code.CfJsrRet.error():30:30 -> t
     4:4:int getCompareToId():42 -> t
-com.android.tools.r8.cf.code.CfJumpInstruction -> com.android.tools.r8.internal.Y7:
+com.android.tools.r8.cf.code.CfJumpInstruction -> com.android.tools.r8.internal.b8:
     1:1:void <init>():7:7 -> <init>
     boolean isJump() -> D
     boolean hasFallthrough() -> H
     com.android.tools.r8.cf.code.CfJumpInstruction asJump() -> k
-com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.Z7:
+com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.c8:
     com.android.tools.r8.org.objectweb.asm.Label label -> c
     1:3:void <init>():27:29 -> <init>
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():32:35 -> H
@@ -7491,7 +7530,7 @@
     com.android.tools.r8.cf.code.CfLabel asLabel() -> l
     boolean emitsIR() -> s
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.e8:
+com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.h8:
     com.android.tools.r8.ir.code.ValueType type -> d
     boolean $assertionsDisabled -> e
     int var -> c
@@ -7550,10 +7589,10 @@
     18:18:int getCompareToId():44 -> t
     15:15:int com.android.tools.r8.cf.code.CfLoad.getLoadType():66:66 -> t
     15:15:int getCompareToId():44 -> t
-com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.d8:
+com.android.tools.r8.cf.code.CfLoad$1 -> com.android.tools.r8.internal.g8:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():54:54 -> <clinit>
-com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.g8:
+com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.j8:
     com.android.tools.r8.ir.code.NumericType type -> d
     boolean $assertionsDisabled -> e
     int $r8$clinit -> f
@@ -7594,16 +7633,16 @@
     203:203:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):154:154 -> a
     204:204:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):151:151 -> a
     225:237:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):187:199 -> a
-    238:238:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):142:142 -> a
+    238:238:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):143:143 -> a
     238:238:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):199 -> a
     239:239:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):200:200 -> a
-    240:240:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):142:142 -> a
+    240:240:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):143:143 -> a
     240:240:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):200 -> a
     241:241:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):201:201 -> a
-    242:242:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):282:282 -> a
+    242:242:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):283:283 -> a
     242:242:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):201 -> a
     1:1:int getCompareToId():54:54 -> t
-com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.f8:
+com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.i8:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Ushr -> d
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode And -> e
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Shl -> b
@@ -7612,7 +7651,7 @@
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Xor -> g
     1:6:void <clinit>():33:38 -> <clinit>
     1:1:void <init>(java.lang.String,int):32:32 -> <init>
-com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.h8:
+com.android.tools.r8.cf.code.CfMonitor -> com.android.tools.r8.internal.k8:
     com.android.tools.r8.ir.code.Monitor$Type type -> c
     1:2:void <init>(com.android.tools.r8.ir.code.Monitor$Type):33:34 -> <init>
     1:1:com.android.tools.r8.ir.code.Monitor$Type getType():38:38 -> H
@@ -7635,7 +7674,7 @@
     boolean canThrow() -> r
     1:1:int com.android.tools.r8.cf.code.CfMonitor.getAsmOpcode():71:71 -> t
     1:1:int getCompareToId():43 -> t
-com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.i8:
+com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.l8:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType type -> c
     int dimensions -> d
@@ -7663,7 +7702,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> q
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.k8:
+com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.n8:
     com.android.tools.r8.ir.code.NumericType type -> c
     int $r8$clinit -> d
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):34:35 -> <init>
@@ -7680,18 +7719,18 @@
     3:3:void print(com.android.tools.r8.cf.CfPrinter):73:73 -> a
     4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):111:112 -> a
     6:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):129:129 -> a
-    7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):142:142 -> a
+    7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):143:143 -> a
     7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):129 -> a
     8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):129:129 -> a
-    9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):282:282 -> a
+    9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):283:283 -> a
     9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):129 -> a
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():339:339 -> a
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):118 -> a
     1:1:int getCompareToId():44:44 -> t
-com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.j8:
+com.android.tools.r8.cf.code.CfNeg$1 -> com.android.tools.r8.internal.m8:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():77:77 -> <clinit>
-com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.l8:
+com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.o8:
     com.android.tools.r8.graph.DexType type -> c
     com.android.tools.r8.cf.code.CfLabel label -> d
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.cf.code.CfLabel):41:43 -> <init>
@@ -7710,14 +7749,14 @@
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):125:125 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):131:131 -> a
     10:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):142:142 -> a
-    11:11:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):84:84 -> a
+    11:11:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):83:83 -> a
     11:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):142 -> a
     12:12:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):142:142 -> a
     1:1:com.android.tools.r8.graph.DexType getType():69:69 -> getType
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> q
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.m8:
+com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.p8:
     com.android.tools.r8.graph.DexType type -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():34:34 -> <clinit>
@@ -7759,7 +7798,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> q
     boolean canThrow() -> r
     1:1:int getCompareToId():65:65 -> t
-com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.n8:
+com.android.tools.r8.cf.code.CfNewUnboxedEnum -> com.android.tools.r8.internal.q8:
     com.android.tools.r8.graph.DexType type -> c
     int ordinal -> d
     1:3:void <init>(com.android.tools.r8.graph.DexType,int):38:40 -> <init>
@@ -7781,7 +7820,7 @@
     com.android.tools.r8.cf.code.CfTypeInstruction asTypeInstruction() -> q
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.o8:
+com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.r8:
     1:1:void <init>():27:27 -> <init>
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory) -> 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):37:37 -> a
@@ -7791,7 +7830,7 @@
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):76:76 -> a
     boolean emitsIR() -> s
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.q8:
+com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.t8:
     com.android.tools.r8.ir.code.NumericType to -> d
     com.android.tools.r8.ir.code.NumericType from -> c
     boolean $assertionsDisabled -> e
@@ -7839,18 +7878,18 @@
     3:3:void print(com.android.tools.r8.cf.CfPrinter):83:83 -> a
     4:5:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):182:183 -> a
     6:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):200:200 -> a
-    7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):142:142 -> a
+    7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumericType):143:143 -> a
     7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):200 -> a
     8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):200:200 -> a
-    9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):282:282 -> a
+    9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.ir.code.NumericType):283:283 -> a
     9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):200 -> a
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forUnop():339:339 -> a
     10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):189 -> a
     1:1:int getCompareToId():46:46 -> t
-com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.p8:
+com.android.tools.r8.cf.code.CfNumberConversion$1 -> com.android.tools.r8.internal.s8:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():89:89 -> <clinit>
-com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.u8:
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.x8:
     com.android.tools.r8.cf.code.CfLabel label -> c
     com.android.tools.r8.ir.code.Position position -> d
     1:3:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.Position):32:34 -> <init>
@@ -7871,7 +7910,7 @@
     com.android.tools.r8.cf.code.CfPosition asPosition() -> n
     boolean emitsIR() -> s
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfRecordFieldValues -> com.android.tools.r8.internal.E8:
+com.android.tools.r8.cf.code.CfRecordFieldValues -> com.android.tools.r8.internal.H8:
     com.android.tools.r8.graph.DexField[] fields -> c
     1:2:void <init>(com.android.tools.r8.graph.DexField[]):36:37 -> <init>
     1:1:com.android.tools.r8.graph.DexField[] getFields():73:73 -> H
@@ -7910,7 +7949,7 @@
     41:41:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):109 -> a
     com.android.tools.r8.cf.code.CfRecordFieldValues asRecordFieldValues() -> o
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.I8:
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.L8:
     com.android.tools.r8.ir.code.ValueType type -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():32:32 -> <clinit>
@@ -7948,10 +7987,10 @@
     18:18:int getCompareToId():46 -> t
     15:15:int com.android.tools.r8.cf.code.CfReturn.getOpcode():68:68 -> t
     15:15:int getCompareToId():46 -> t
-com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.H8:
+com.android.tools.r8.cf.code.CfReturn$1 -> com.android.tools.r8.internal.K8:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():56:56 -> <clinit>
-com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.J8:
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.M8:
     1:1:void <init>():29:29 -> <init>
     boolean isReturn() -> F
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):36:36 -> a
@@ -7963,11 +8002,11 @@
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():315:315 -> a
     7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):91 -> a
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfSafeCheckCast -> com.android.tools.r8.internal.K8:
+com.android.tools.r8.cf.code.CfSafeCheckCast -> com.android.tools.r8.internal.N8:
     1:1:void <init>(com.android.tools.r8.graph.DexType):17:17 -> <init>
     1:1:void addCheckCast(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState$Slot):22:22 -> a
     2:2:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):28:28 -> a
-com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.S8:
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.V8:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():32:32 -> <clinit>
@@ -8096,30 +8135,30 @@
     262:262:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):147 -> a
     263:266:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):136:139 -> a
     267:268:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):130:131 -> a
-    269:269:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):220:220 -> a
+    269:269:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):221:221 -> a
     269:269:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):381 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    270:270:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):220:220 -> a
+    270:270:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):221:221 -> a
     270:270:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$0(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):381 -> a
-    271:271:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):228:228 -> a
+    271:271:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):229:229 -> a
     271:271:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):387 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    272:272:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):228:228 -> a
+    272:272:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):229:229 -> a
     272:272:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):387 -> a
-    273:273:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):228:228 -> a
+    273:273:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):229:229 -> a
     273:273:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$15(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):455 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    274:274:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):228:228 -> a
+    274:274:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):229:229 -> a
     274:274:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$15(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):455 -> a
-    275:275:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):237:237 -> a
+    275:275:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):238:238 -> a
     275:275:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$14(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):454 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    276:278:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):238:240 -> a
+    276:278:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):239:241 -> a
     276:278:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$14(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):454 -> a
-    279:279:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):250:250 -> a
+    279:279:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):251:251 -> a
     279:279:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$12(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):450 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    280:283:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):251:254 -> a
+    280:283:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:255 -> a
     280:283:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$12(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):450 -> a
     284:289:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):259:264 -> a
     290:290:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1304:1304 -> a
@@ -8130,10 +8169,10 @@
     293:293:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):268:268 -> a
     294:294:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1304:1304 -> a
     294:294:void dup1x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):268 -> a
-    295:295:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):265:265 -> a
+    295:295:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):266:266 -> a
     295:295:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$11(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):448 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    296:300:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):266:270 -> a
+    296:300:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):267:271 -> a
     296:300:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$11(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):448 -> a
     301:308:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):295:302 -> a
     309:309:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1304:1304 -> a
@@ -8161,52 +8200,52 @@
     429:429:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):381:381 -> a
     430:430:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):376:376 -> a
     431:431:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):367:367 -> a
-    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):228:228 -> b
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):229:229 -> b
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$3(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):401 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):228:228 -> b
+    2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):229:229 -> b
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$3(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):401 -> b
-    3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):237:237 -> b
+    3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):238:238 -> b
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$2(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):400 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):238:240 -> b
+    4:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):239:241 -> b
     4:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$2(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):400 -> b
-    7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):250:250 -> b
+    7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):251:251 -> b
     7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$7(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):425 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):251:254 -> b
+    8:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:255 -> b
     8:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$7(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):425 -> b
     12:12:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$10(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):427:427 -> b
     13:13:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$13(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):446:446 -> b
-    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):220:220 -> c
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):221:221 -> c
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$17(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):462 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):220:220 -> c
+    2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):221:221 -> c
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$17(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):462 -> c
-    3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):228:228 -> c
+    3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):229:229 -> c
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$9(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):428 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):228:228 -> c
+    4:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):229:229 -> c
     4:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$9(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):428 -> c
     5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$16(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):452:452 -> c
-    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):237:237 -> d
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):238:238 -> d
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$5(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):411 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):238:240 -> d
+    2:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):239:241 -> d
     2:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$5(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):411 -> d
     5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$4(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):398:398 -> d
-    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):220:220 -> e
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):221:221 -> e
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$6(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):412 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):220:220 -> e
+    2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):221:221 -> e
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$6(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):412 -> e
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$evaluate$8(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):423:423 -> e
     boolean emitsIR() -> s
     1:1:int getCompareToId():89:89 -> t
-com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.R8:
+com.android.tools.r8.cf.code.CfStackInstruction$1 -> com.android.tools.r8.internal.U8:
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfStackInstruction$Opcode -> a
     1:1:void <clinit>():127:127 -> <clinit>
-com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.S8$a:
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.V8$a:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X2 -> j
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X1 -> i
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] $VALUES -> l
@@ -8223,7 +8262,7 @@
     1:2:void <init>(java.lang.String,int,int):47:48 -> <init>
     1:1:int access$000(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):34:34 -> a
     2:2:com.android.tools.r8.cf.code.CfStackInstruction$Opcode[] values():34:34 -> a
-com.android.tools.r8.cf.code.CfStaticFieldRead -> com.android.tools.r8.internal.d9:
+com.android.tools.r8.cf.code.CfStaticFieldRead -> com.android.tools.r8.internal.g9:
     1:1:void <init>(com.android.tools.r8.graph.DexField):28:28 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):32:32 -> <init>
     int getOpcode() -> I
@@ -8233,7 +8272,7 @@
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):63:63 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):69:69 -> a
     5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):80:80 -> a
-com.android.tools.r8.cf.code.CfStaticFieldWrite -> com.android.tools.r8.internal.e9:
+com.android.tools.r8.cf.code.CfStaticFieldWrite -> com.android.tools.r8.internal.h9:
     1:1:void <init>(com.android.tools.r8.graph.DexField):28:28 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):32:32 -> <init>
     int getOpcode() -> I
@@ -8242,7 +8281,7 @@
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):58:59 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):65:65 -> a
     6:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):76:76 -> a
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.g9:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.j9:
     com.android.tools.r8.ir.code.ValueType type -> d
     boolean $assertionsDisabled -> e
     int var -> c
@@ -8279,7 +8318,7 @@
     33:33:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):138 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     34:35:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):138:139 -> a
-    36:36:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):153:153 -> a
+    36:36:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):154:154 -> a
     36:36:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState evaluate(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexItemFactory):139 -> a
     37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forStore():327:327 -> a
     37:37:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):124 -> a
@@ -8297,10 +8336,10 @@
     18:18:int getCompareToId():42 -> t
     15:15:int com.android.tools.r8.cf.code.CfStore.getStoreType():64:64 -> t
     15:15:int getCompareToId():42 -> t
-com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.f9:
+com.android.tools.r8.cf.code.CfStore$1 -> com.android.tools.r8.internal.i9:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():52:52 -> <clinit>
-com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.i9:
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.l9:
     java.util.List targets -> f
     com.android.tools.r8.cf.code.CfSwitch$Kind kind -> c
     int[] keys -> e
@@ -8330,17 +8369,17 @@
     33:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():267:267 -> a
     33:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):170 -> a
     1:1:int getCompareToId():65:65 -> t
-com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.h9:
+com.android.tools.r8.cf.code.CfSwitch$1 -> com.android.tools.r8.internal.k9:
     int[] $SwitchMap$com$android$tools$r8$cf$code$CfSwitch$Kind -> a
     1:1:void <clinit>():126:126 -> <clinit>
-com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.i9$a:
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.l9$a:
     com.android.tools.r8.cf.code.CfSwitch$Kind TABLE -> c
     com.android.tools.r8.cf.code.CfSwitch$Kind[] $VALUES -> d
     com.android.tools.r8.cf.code.CfSwitch$Kind LOOKUP -> b
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(java.lang.String,int):37:37 -> <init>
     1:1:com.android.tools.r8.cf.code.CfSwitch$Kind[] values():37:37 -> a
-com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.j9:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.m9:
     1:1:void <init>():30:30 -> <init>
     1:1:com.android.tools.r8.utils.TraversalContinuation traverseNormalTargets(java.util.function.BiFunction,com.android.tools.r8.cf.code.CfInstruction,java.lang.Object):37:37 -> 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:48 -> a
@@ -8352,7 +8391,7 @@
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.ProgramMethod):98 -> a
     boolean canThrow() -> r
     int getCompareToId() -> t
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.k9:
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.n9:
     com.android.tools.r8.cf.code.CfLabel start -> a
     com.android.tools.r8.cf.code.CfLabel end -> b
     java.util.List targets -> d
@@ -8377,11 +8416,11 @@
     1:1:com.android.tools.r8.cf.code.CfLabel lambda$acceptCompareTo$1(com.android.tools.r8.cf.code.CfTryCatch):74:74 -> b
     1:1:java.util.Collection lambda$acceptCompareTo$2(com.android.tools.r8.cf.code.CfTryCatch):75:75 -> c
     1:1:java.util.Collection lambda$acceptCompareTo$3(com.android.tools.r8.cf.code.CfTryCatch):76:76 -> d
-com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.l9:
-com.android.tools.r8.cf.code.frame.BaseFrameType -> com.android.tools.r8.internal.B4:
+com.android.tools.r8.cf.code.CfTypeInstruction -> com.android.tools.r8.internal.o9:
+com.android.tools.r8.cf.code.frame.BaseFrameType -> com.android.tools.r8.internal.D4:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():11:11 -> <clinit>
-    1:1:void <init>():187:187 -> <init>
+    1:1:void <init>():192:192 -> <init>
     com.android.tools.r8.cf.code.frame.UninitializedNew asUninitializedNew() -> A
     1:1:boolean isPrecise():71:71 -> B
     2:2:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isOneWord():0:0 -> B
@@ -8390,7 +8429,8 @@
     3:3:boolean isPrecise():71 -> B
     4:4:boolean isPrecise():71:71 -> B
     com.android.tools.r8.cf.code.frame.UninitializedFrameType asUninitialized() -> C
-    com.android.tools.r8.cf.code.CfLabel getUninitializedLabel() -> E
+    boolean isInitializedReferenceType() -> D
+    com.android.tools.r8.cf.code.CfLabel getUninitializedLabel() -> F
     com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory) -> a
     boolean isInitialized() -> a
     1:1:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexType):65:65 -> b
@@ -8414,92 +8454,93 @@
     boolean isUninitialized() -> t
     com.android.tools.r8.cf.code.frame.WideFrameType asWide() -> u
     boolean isDouble() -> v
-    1:1:int getWidth():123:123 -> w
+    1:1:int getWidth():128:128 -> w
     boolean isObject() -> x
     com.android.tools.r8.cf.code.frame.SingleFrameType asSingle() -> y
     boolean isUninitializedNew() -> z
-com.android.tools.r8.cf.code.frame.BooleanFrameType -> com.android.tools.r8.internal.A5:
+com.android.tools.r8.cf.code.frame.BooleanFrameType -> com.android.tools.r8.internal.C5:
     com.android.tools.r8.cf.code.frame.BooleanFrameType SINGLETON -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.ByteFrameType -> com.android.tools.r8.internal.n6:
+com.android.tools.r8.cf.code.frame.ByteFrameType -> com.android.tools.r8.internal.p6:
     com.android.tools.r8.cf.code.frame.ByteFrameType SINGLETON -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
-    boolean hasIntVerificationType() -> F
+    boolean hasIntVerificationType() -> G
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.CharFrameType -> com.android.tools.r8.internal.s9:
+com.android.tools.r8.cf.code.frame.CharFrameType -> com.android.tools.r8.internal.v9:
     com.android.tools.r8.cf.code.frame.CharFrameType SINGLETON -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
-    boolean hasIntVerificationType() -> F
+    boolean hasIntVerificationType() -> G
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.DoubleFrameType -> com.android.tools.r8.internal.bi:
+com.android.tools.r8.cf.code.frame.DoubleFrameType -> com.android.tools.r8.internal.fi:
     com.android.tools.r8.cf.code.frame.DoubleFrameType SINGLETON -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):36:36 -> a
     1:1:java.lang.String getTypeName():31:31 -> getTypeName
-com.android.tools.r8.cf.code.frame.FloatFrameType -> com.android.tools.r8.internal.tl:
+com.android.tools.r8.cf.code.frame.FloatFrameType -> com.android.tools.r8.internal.yl:
     com.android.tools.r8.cf.code.frame.FloatFrameType SINGLETON -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.FrameType -> com.android.tools.r8.internal.Ql:
+com.android.tools.r8.cf.code.frame.FrameType -> com.android.tools.r8.internal.Vl:
     int $r8$clinit -> a
     1:1:void <clinit>():17:17 -> <clinit>
     com.android.tools.r8.cf.code.frame.UninitializedNew asUninitializedNew() -> A
     boolean isPrecise() -> B
     com.android.tools.r8.cf.code.frame.UninitializedFrameType asUninitialized() -> C
-    1:1:com.android.tools.r8.cf.code.frame.TwoWord twoWord():96:96 -> D
-    com.android.tools.r8.cf.code.CfLabel getUninitializedLabel() -> E
+    boolean isInitializedReferenceType() -> D
+    1:1:com.android.tools.r8.cf.code.frame.TwoWord twoWord():95:95 -> E
+    com.android.tools.r8.cf.code.CfLabel getUninitializedLabel() -> F
     com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory) -> a
     java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens) -> a
     boolean isInitialized() -> a
     1:1:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):52:52 -> a
-    2:22:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):59:79 -> a
-    2:22:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    23:23:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":47,"2":48,"3":49}}
-    47:47:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):79:79 -> a
+    2:21:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):59:78 -> a
+    2:21:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
+    22:22:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":46,"2":47,"3":48}}
+    46:46:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):78:78 -> a
+    46:46:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
+    47:47:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):78:78 -> a
     47:47:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    48:48:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):79:79 -> a
+    48:48:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):78:78 -> a
     48:48:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    49:49:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):79:79 -> a
-    49:49:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    24:24:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):79:79 -> a
-    24:24:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    25:39:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):63:77 -> a
-    25:39:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    40:40:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):75:75 -> a
+    23:23:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):78:78 -> a
+    23:23:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
+    24:38:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):62:76 -> a
+    24:38:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
+    39:39:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):74:74 -> a
+    39:39:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
+    40:40:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):72:72 -> a
     40:40:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    41:41:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):73:73 -> a
+    41:41:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):70:70 -> a
     41:41:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    42:42:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):71:71 -> a
+    42:42:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):68:68 -> a
     42:42:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    43:43:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):69:69 -> a
+    43:43:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):66:66 -> a
     43:43:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    44:44:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):67:67 -> a
+    44:44:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):64:64 -> a
     44:44:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    45:45:com.android.tools.r8.cf.code.frame.PrimitiveFrameType com.android.tools.r8.cf.code.frame.FrameType.primitive(com.android.tools.r8.graph.DexType):65:65 -> a
-    45:45:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):53 -> a
-    46:46:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):55:55 -> a
-    50:66:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):104:120 -> a
-    67:67:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):118:118 -> a
-    68:68:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):116:116 -> a
-    69:69:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):114:114 -> a
-    70:70:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):112:112 -> a
-    71:71:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):107:107 -> a
+    45:45:com.android.tools.r8.cf.code.frame.InitializedFrameType initialized(com.android.tools.r8.graph.DexType):55:55 -> a
+    49:65:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):103:119 -> a
+    66:66:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):117:117 -> a
+    67:67:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):115:115 -> a
+    68:68:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):113:113 -> a
+    69:69:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):111:111 -> a
+    70:70:com.android.tools.r8.cf.code.frame.InitializedFrameType fromPreciseMemberType(com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.graph.DexItemFactory):106:106 -> a
     com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexType) -> b
     1:1:com.android.tools.r8.cf.code.frame.DoubleFrameType doubleType():32:32 -> b
     boolean isSingle() -> c
@@ -8510,15 +8551,15 @@
     boolean isOneWord() -> h
     com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType asInitializedReferenceType() -> i
     boolean isUninitializedThis() -> j
-    1:1:com.android.tools.r8.cf.code.frame.OneWord oneWord():92:92 -> k
+    1:1:com.android.tools.r8.cf.code.frame.OneWord oneWord():91:91 -> k
     com.android.tools.r8.graph.DexType getUninitializedNewType() -> l
     com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise() -> m
-    1:1:com.android.tools.r8.cf.code.frame.FrameType map(java.util.function.Function):195:195 -> map
+    1:1:com.android.tools.r8.cf.code.frame.FrameType map(java.util.function.Function):196:196 -> map
     com.android.tools.r8.cf.code.frame.SinglePrimitiveFrameType asSinglePrimitive() -> n
     boolean isLong() -> o
     boolean isWide() -> p
     1:1:com.android.tools.r8.cf.code.frame.LongFrameType longType():44:44 -> q
-    1:1:com.android.tools.r8.cf.code.frame.UninitializedThis uninitializedThis():88:88 -> r
+    1:1:com.android.tools.r8.cf.code.frame.UninitializedThis uninitializedThis():87:87 -> r
     com.android.tools.r8.cf.code.frame.UninitializedThis asUninitializedThis() -> s
     boolean isUninitialized() -> t
     com.android.tools.r8.cf.code.frame.WideFrameType asWide() -> u
@@ -8527,91 +8568,91 @@
     boolean isObject() -> x
     com.android.tools.r8.cf.code.frame.SingleFrameType asSingle() -> y
     boolean isUninitializedNew() -> z
-com.android.tools.r8.cf.code.frame.FrameType$1 -> com.android.tools.r8.internal.Pl:
+com.android.tools.r8.cf.code.frame.FrameType$1 -> com.android.tools.r8.internal.Ul:
     int[] $SwitchMap$com$android$tools$r8$ir$code$MemberType -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():105:105 -> <clinit>
+    1:1:void <clinit>():104:104 -> <clinit>
     2:2:void <clinit>():59:59 -> <clinit>
-com.android.tools.r8.cf.code.frame.InitializedFrameType -> com.android.tools.r8.internal.mq:
-com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType -> com.android.tools.r8.internal.nq:
+com.android.tools.r8.cf.code.frame.InitializedFrameType -> com.android.tools.r8.internal.rq:
+com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType -> com.android.tools.r8.internal.sq:
     com.android.tools.r8.graph.DexType type -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():15:15 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.DexType):20:23 -> <init>
     boolean isPrecise() -> B
-    1:1:com.android.tools.r8.graph.DexType getInitializedType():124:124 -> F
-    1:4:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):43:46 -> a
+    1:1:com.android.tools.r8.graph.DexType getInitializedType():129:129 -> G
+    1:4:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):48:51 -> a
     5:5:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isOneWord():0:0 -> a
-    5:5:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):46 -> a
-    6:9:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):46:49 -> a
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType.getInitializedType():124:124 -> a
-    10:10:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):49 -> a
+    5:5:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):51 -> a
+    6:9:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):51:54 -> a
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType.getInitializedType():129:129 -> a
+    10:10:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):54 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:12:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):50:51 -> a
-    13:13:boolean com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType.isNullType():134:134 -> a
-    13:13:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):52 -> a
-    14:22:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):53:61 -> a
-    23:23:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):47:47 -> a
-    24:24:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):88:88 -> a
+    11:12:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):55:56 -> a
+    13:13:boolean com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType.isNullType():139:139 -> a
+    13:13:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):57 -> a
+    14:22:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):58:66 -> a
+    23:23:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):52:52 -> a
+    24:24:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):93:93 -> a
     25:25:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":238,"2":239,"3":240}}
-    238:238:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):88:88 -> a
-    239:239:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    239:239:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):88 -> a
-    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    240:240:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):88 -> a
-    114:115:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):89:90 -> a
-    116:116:char com.android.tools.r8.graph.DexType.toShorty():226:226 -> a
-    116:116:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):92 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":248,"2":249,"3":250}}
+    248:248:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):93:93 -> a
+    249:249:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    249:249:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):93 -> a
+    250:250:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    250:250:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):93 -> a
+    119:120:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):94:95 -> a
+    121:121:char com.android.tools.r8.graph.DexType.toShorty():226:226 -> a
+    121:121:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):97 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    117:117:char com.android.tools.r8.graph.DexType.toShorty():226:226 -> a
-    117:117:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):92 -> a
-    118:122:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):100:104 -> a
-    123:123:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":241,"2":242,"3":243,"4":244,"5":245}}
-    241:241:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104:104 -> a
-    242:242:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104:104 -> a
-    243:243:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104:104 -> a
-    244:244:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104:104 -> a
-    245:245:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104:104 -> a
-    227:227:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):104:104 -> a
-    228:228:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):96:96 -> a
-    229:237:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):94:102 -> a
-    246:246:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType.getInitializedType():124:124 -> a
-    246:246:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):129 -> a
-    1:1:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexType):144:144 -> b
-    2:2:boolean com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType.isObject():139:139 -> b
-    2:2:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexType):144 -> b
-    3:4:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexType):144:145 -> b
-    1:5:boolean equals(java.lang.Object):69:73 -> equals
-    1:1:boolean isNullType():134:134 -> g
-    1:1:int hashCode():78:78 -> hashCode
+    122:122:char com.android.tools.r8.graph.DexType.toShorty():226:226 -> a
+    122:122:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):97 -> a
+    123:127:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):105:109 -> a
+    128:128:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":251,"2":252,"3":253,"4":254,"5":255}}
+    251:251:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):109:109 -> a
+    252:252:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):109:109 -> a
+    253:253:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):109:109 -> a
+    254:254:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):109:109 -> a
+    255:255:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):109:109 -> a
+    237:237:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):109:109 -> a
+    238:238:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):101:101 -> a
+    239:247:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):99:107 -> a
+    256:256:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType.getInitializedType():129:129 -> a
+    256:256:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):134 -> a
+    1:1:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexType):149:149 -> b
+    2:2:boolean com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType.isObject():144:144 -> b
+    2:2:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexType):149 -> b
+    3:4:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexType):149:150 -> b
+    1:5:boolean equals(java.lang.Object):74:78 -> equals
+    1:1:boolean isNullType():139:139 -> g
+    1:1:int hashCode():83:83 -> hashCode
     com.android.tools.r8.cf.code.frame.InitializedReferenceFrameType asInitializedReferenceType() -> i
     com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise() -> m
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":85,"2":86,"3":87}}
-    85:85:java.lang.String toString():83:83 -> toString
-    86:86:java.lang.String toString():83:83 -> toString
-    87:87:java.lang.String toString():83:83 -> toString
-    84:84:java.lang.String toString():83:83 -> toString
-    1:1:boolean isObject():139:139 -> x
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":90,"2":91,"3":92}}
+    90:90:java.lang.String toString():88:88 -> toString
+    91:91:java.lang.String toString():88:88 -> toString
+    92:92:java.lang.String toString():88:88 -> toString
+    89:89:java.lang.String toString():88:88 -> toString
+    1:1:boolean isObject():144:144 -> x
     com.android.tools.r8.cf.code.frame.SingleFrameType asSingle() -> y
-com.android.tools.r8.cf.code.frame.IntFrameType -> com.android.tools.r8.internal.Cu:
+com.android.tools.r8.cf.code.frame.IntFrameType -> com.android.tools.r8.internal.Iu:
     com.android.tools.r8.cf.code.frame.IntFrameType SINGLETON -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
-    boolean hasIntVerificationType() -> F
+    boolean hasIntVerificationType() -> G
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.LongFrameType -> com.android.tools.r8.internal.FE:
+com.android.tools.r8.cf.code.frame.LongFrameType -> com.android.tools.r8.internal.ME:
     com.android.tools.r8.cf.code.frame.LongFrameType SINGLETON -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):36:36 -> a
     1:1:java.lang.String getTypeName():31:31 -> getTypeName
-com.android.tools.r8.cf.code.frame.OneWord -> com.android.tools.r8.internal.DM:
+com.android.tools.r8.cf.code.frame.OneWord -> com.android.tools.r8.internal.UM:
     com.android.tools.r8.cf.code.frame.OneWord SINGLETON -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -8619,36 +8660,36 @@
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):34:34 -> a
     1:1:java.lang.String toString():39:39 -> toString
     com.android.tools.r8.cf.code.frame.SingleFrameType asSingle() -> y
-com.android.tools.r8.cf.code.frame.PreciseFrameType -> com.android.tools.r8.internal.lO:
+com.android.tools.r8.cf.code.frame.PreciseFrameType -> com.android.tools.r8.internal.DO:
     1:1:com.android.tools.r8.cf.code.frame.FrameType map(java.util.function.Function):10:10 -> map
     2:14:com.android.tools.r8.cf.code.frame.PreciseFrameType map(java.util.function.Function):14:26 -> map
-    15:15:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):84:84 -> map
+    15:15:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):83:83 -> map
     15:15:com.android.tools.r8.cf.code.frame.PreciseFrameType map(java.util.function.Function):26 -> map
-com.android.tools.r8.cf.code.frame.PrimitiveFrameType -> com.android.tools.r8.internal.QO:
-com.android.tools.r8.cf.code.frame.ShortFrameType -> com.android.tools.r8.internal.RW:
+com.android.tools.r8.cf.code.frame.PrimitiveFrameType -> com.android.tools.r8.internal.iP:
+com.android.tools.r8.cf.code.frame.ShortFrameType -> com.android.tools.r8.internal.mX:
     com.android.tools.r8.cf.code.frame.ShortFrameType SINGLETON -> c
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
-    boolean hasIntVerificationType() -> F
+    boolean hasIntVerificationType() -> G
     1:1:com.android.tools.r8.graph.DexType getInitializedType(com.android.tools.r8.graph.DexItemFactory):21:21 -> a
     2:2:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):31:31 -> a
     1:1:java.lang.String getTypeName():26:26 -> getTypeName
-com.android.tools.r8.cf.code.frame.SingleFrameType -> com.android.tools.r8.internal.uX:
+com.android.tools.r8.cf.code.frame.SingleFrameType -> com.android.tools.r8.internal.PX:
     com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType) -> a
-com.android.tools.r8.cf.code.frame.SinglePrimitiveFrameType -> com.android.tools.r8.internal.wX:
+com.android.tools.r8.cf.code.frame.SinglePrimitiveFrameType -> com.android.tools.r8.internal.RX:
     1:1:void <init>():7:7 -> <init>
     boolean isPrecise() -> B
-    boolean hasIntVerificationType() -> F
+    boolean hasIntVerificationType() -> G
     boolean isInitialized() -> a
     1:6:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):54:59 -> a
     com.android.tools.r8.cf.code.frame.PreciseFrameType asPrecise() -> m
     com.android.tools.r8.cf.code.frame.SinglePrimitiveFrameType asSinglePrimitive() -> n
     1:1:java.lang.String toString():64:64 -> toString
     com.android.tools.r8.cf.code.frame.SingleFrameType asSingle() -> y
-com.android.tools.r8.cf.code.frame.SingletonFrameType -> com.android.tools.r8.internal.DX:
+com.android.tools.r8.cf.code.frame.SingletonFrameType -> com.android.tools.r8.internal.YX:
     1:1:void <init>():7:7 -> <init>
     1:1:int hashCode():16:16 -> hashCode
-com.android.tools.r8.cf.code.frame.TwoWord -> com.android.tools.r8.internal.Q10:
+com.android.tools.r8.cf.code.frame.TwoWord -> com.android.tools.r8.internal.m20:
     com.android.tools.r8.cf.code.frame.TwoWord SINGLETON -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -8656,7 +8697,7 @@
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):45:45 -> a
     1:1:java.lang.String toString():50:50 -> toString
     com.android.tools.r8.cf.code.frame.WideFrameType asWide() -> u
-com.android.tools.r8.cf.code.frame.UninitializedFrameType -> com.android.tools.r8.internal.k30:
+com.android.tools.r8.cf.code.frame.UninitializedFrameType -> com.android.tools.r8.internal.G30:
     1:1:void <init>():7:7 -> <init>
     boolean isPrecise() -> B
     com.android.tools.r8.cf.code.frame.UninitializedFrameType asUninitialized() -> C
@@ -8664,12 +8705,12 @@
     boolean isUninitialized() -> t
     boolean isObject() -> x
     com.android.tools.r8.cf.code.frame.SingleFrameType asSingle() -> y
-com.android.tools.r8.cf.code.frame.UninitializedNew -> com.android.tools.r8.internal.m30:
+com.android.tools.r8.cf.code.frame.UninitializedNew -> com.android.tools.r8.internal.I30:
     com.android.tools.r8.graph.DexType type -> d
     com.android.tools.r8.cf.code.CfLabel label -> c
     1:3:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):18:20 -> <init>
     com.android.tools.r8.cf.code.frame.UninitializedNew asUninitializedNew() -> A
-    1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():35:35 -> E
+    1:1:com.android.tools.r8.cf.code.CfLabel getUninitializedLabel():35:35 -> F
     1:1:java.lang.Object getTypeOpcode(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):30:30 -> a
     2:2:com.android.tools.r8.cf.code.frame.SingleFrameType join(com.android.tools.r8.cf.code.frame.SingleFrameType):55:55 -> a
     1:1:com.android.tools.r8.graph.DexType getObjectType(com.android.tools.r8.graph.DexType):25:25 -> b
@@ -8677,7 +8718,7 @@
     1:1:int hashCode():72:72 -> hashCode
     1:1:com.android.tools.r8.graph.DexType getUninitializedNewType():40:40 -> l
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.cf.code.frame.UninitializedThis -> com.android.tools.r8.internal.o30:
+com.android.tools.r8.cf.code.frame.UninitializedThis -> com.android.tools.r8.internal.K30:
     com.android.tools.r8.cf.code.frame.UninitializedThis SINGLETON -> c
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -8687,9 +8728,9 @@
     1:1:int hashCode():53:53 -> hashCode
     com.android.tools.r8.cf.code.frame.UninitializedThis asUninitializedThis() -> s
     1:1:java.lang.String toString():58:58 -> toString
-com.android.tools.r8.cf.code.frame.WideFrameType -> com.android.tools.r8.internal.k50:
+com.android.tools.r8.cf.code.frame.WideFrameType -> com.android.tools.r8.internal.G50:
     com.android.tools.r8.cf.code.frame.WideFrameType join(com.android.tools.r8.cf.code.frame.WideFrameType) -> a
-com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType -> com.android.tools.r8.internal.l50:
+com.android.tools.r8.cf.code.frame.WidePrimitiveFrameType -> com.android.tools.r8.internal.H50:
     1:1:void <init>():7:7 -> <init>
     boolean isPrecise() -> B
     boolean isInitialized() -> a
@@ -8707,10 +8748,10 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object,java.lang.Object):899:899 -> a
     2:2:java.lang.Object or(java.lang.Object):48 -> a
     1:1:java.lang.String toString():91:91 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.w9:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.z9:
     1:1:void <init>():359:359 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.t9:
+com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.w9:
     com.android.tools.r8.com.google.common.base.CharMatcher$Any INSTANCE -> c
     1:1:void <clinit>():1011:1011 -> <clinit>
     1:1:void <init>():1014:1014 -> <init>
@@ -8718,7 +8759,7 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():127:127 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$Any.negate():1101 -> negate
     1:1:java.util.function.Predicate negate():1009 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.u9:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.x9:
     java.lang.String description -> b
     1:1:void com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.<init>():939:939 -> <init>
     1:1:void <init>(java.lang.String):957 -> <init>
@@ -8731,7 +8772,7 @@
     2:2:boolean com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.apply(java.lang.Object):0 -> apply
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.lang.String toString():963:963 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.v9:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.y9:
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> c
     1:1:void <clinit>():1108:1108 -> <clinit>
     1:1:void <init>():1111:1111 -> <init>
@@ -8739,12 +8780,12 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():118:118 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$None.negate():1204 -> negate
     1:1:java.util.function.Predicate negate():1106 -> negate
-com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.D9:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.G9:
     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.Cc:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.Fc:
     1:1:void <init>():25:25 -> <init>
-com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.Lj:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.Qj:
     1:1:void <init>():39:39 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -8752,7 +8793,7 @@
     2:2:int hash(java.lang.Object):112:112 -> 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):76:76 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Kj:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Pj:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.lang.Object reference -> c
     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):185:185 -> <init>
@@ -8761,27 +8802,27 @@
     1:11:boolean equals(java.lang.Object):209:219 -> equals
     1:1:int hashCode():228:228 -> hashCode
     1:1:java.lang.String toString():237:237 -> toString
-com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.qm:
-com.android.tools.r8.com.google.common.base.Java8Usage -> com.android.tools.r8.internal.Uw:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.vm:
+com.android.tools.r8.com.google.common.base.Java8Usage -> com.android.tools.r8.internal.ax:
     void lambda$performCheck$0() -> a
     1:2:java.lang.String performCheck():39:40 -> b
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.cx:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.ix:
     java.util.regex.Pattern pattern -> b
     1:2:void <init>(java.util.regex.Pattern):27:28 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence):33:33 -> a
     1:1:java.lang.String toString():48:48 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.bx:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.hx:
     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):54 -> <init>
     2:2:void <init>(java.util.regex.Matcher):55:55 -> <init>
-com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.uM:
+com.android.tools.r8.com.google.common.base.Objects -> com.android.tools.r8.internal.LM:
     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.OM:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.fN:
     1:1:void <init>():161:161 -> <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.YN:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.qO:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> a
     1:1:void <clinit>():33:33 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.base.PatternCompiler com.android.tools.r8.com.google.common.base.Platform.loadPatternCompiler():91:91 -> <clinit>
@@ -8790,10 +8831,10 @@
     1:2:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):82:83 -> a
     3:3:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler.compile(java.lang.String):101:101 -> a
     3:3:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):83 -> a
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.WN:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.oO:
     1:1:void <init>():98:98 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):98:98 -> <init>
-com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.mO:
+com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.EO:
     int $r8$clinit -> a
     1:9:void <clinit>():1439:1447 -> <clinit>
     1:1:void checkArgument(boolean):130:130 -> a
@@ -8829,9 +8870,9 @@
     2:2:int checkPositionIndex(int,int):1374:1374 -> b
     3:3:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1392:1392 -> b
     3:3:int checkPositionIndex(int,int):1374 -> b
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.nO:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.FO:
     1:1:boolean test(java.lang.Object):79:79 -> test
-com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.xO:
+com.android.tools.r8.com.google.common.base.Predicates -> com.android.tools.r8.internal.PO:
     1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysFalse():57:57 -> a
     2:2:com.android.tools.r8.com.google.common.base.Predicate not(com.android.tools.r8.com.google.common.base.Predicate):83:83 -> 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):147:147 -> a
@@ -8841,32 +8882,32 @@
     5: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):147 -> 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):147:147 -> a
     1:1:com.android.tools.r8.com.google.common.base.Predicate alwaysTrue():51:51 -> b
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.qO:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.IO:
     com.android.tools.r8.com.google.common.base.Predicate predicate -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Predicate):310:311 -> <init>
     1:1:boolean apply(java.lang.Object):316:316 -> apply
     1:3:boolean equals(java.lang.Object):326:328 -> equals
     1:1:int hashCode():321:321 -> hashCode
     1:1:java.lang.String toString():335:335 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.vO:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.NO:
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_TRUE -> b
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_FALSE -> c
     1:37:void <clinit>():252:288 -> <clinit>
     1:1:void <init>(java.lang.String,int):250:250 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):250:250 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.rO:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.JO:
     1:1:void <init>(java.lang.String,int):252:252 -> <init>
     1:1:java.lang.String toString():260:260 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.sO:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.KO:
     1:1:void <init>(java.lang.String,int):264:264 -> <init>
     1:1:java.lang.String toString():272:272 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.tO:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.LO:
     1:1:void <init>(java.lang.String,int):276:276 -> <init>
     1:1:java.lang.String toString():284:284 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.uO:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.MO:
     1:1:void <init>(java.lang.String,int):288:288 -> <init>
     1:1:java.lang.String toString():296:296 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.wO:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.OO:
     java.util.List components -> b
     1:1:void <init>(java.util.List,com.android.tools.r8.com.google.common.base.Predicates$1):384:384 -> <init>
     2:3:void <init>(java.util.List):387:388 -> <init>
@@ -8877,7 +8918,7 @@
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.toStringHelper(java.lang.String,java.lang.Iterable):426:435 -> toString
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.access$800(java.lang.String,java.lang.Iterable):42 -> toString
     2:11:java.lang.String toString():419 -> toString
-com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.ZX:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.uY:
     1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):260:260 -> 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):222:222 -> a
     2:2:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):260 -> a
@@ -8890,7 +8931,7 @@
     5:5:void com.android.tools.r8.com.google.common.base.Splitter.<init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):109 -> a
     5:5: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):226 -> a
     5:5:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):260 -> a
-com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.KZ:
+com.android.tools.r8.com.google.common.base.Strings -> com.android.tools.r8.internal.f00:
     1:5:java.lang.String repeat(java.lang.String,int):144:148 -> a
     6:6:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,int):192:192 -> a
     6:6:java.lang.String repeat(java.lang.String,int):147 -> a
@@ -8900,24 +8941,24 @@
     25:36:java.lang.String com.android.tools.r8.com.google.common.base.Strings.lenientToString(java.lang.Object):302:313 -> a
     25:36:java.lang.String lenientFormat(java.lang.String,java.lang.Object[]):267 -> a
     37:67:java.lang.String lenientFormat(java.lang.String,java.lang.Object[]):267:297 -> a
-com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.c00:
-com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.g00:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.x00:
+com.android.tools.r8.com.google.common.base.Suppliers -> com.android.tools.r8.internal.B00:
     1:7:com.android.tools.r8.com.google.common.base.Supplier memoize(com.android.tools.r8.com.google.common.base.Supplier):102:108 -> a
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.e00:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.z00:
     java.lang.Object value -> d
     com.android.tools.r8.com.google.common.base.Supplier delegate -> b
     boolean initialized -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):119:120 -> <init>
     1:11:java.lang.Object get():126:136 -> get
     1:1:java.lang.String toString():142:142 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.f00:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.A00:
     java.lang.Object value -> d
     com.android.tools.r8.com.google.common.base.Supplier delegate -> b
     boolean initialized -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):157:158 -> <init>
     1:13:java.lang.Object get():164:176 -> get
     1:3:java.lang.String toString():181:183 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.L00:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.h10:
     java.lang.Object jla -> a
     int $r8$clinit -> b
     1:3:java.lang.Object com.android.tools.r8.com.google.common.base.Throwables.getJLA():480:482 -> <clinit>
@@ -9633,12 +9674,12 @@
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):35:35 -> get
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.AbstractListMultimap.get(java.lang.Object):0 -> get
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.collect.BaseImmutableMultimap -> com.android.tools.r8.internal.C4:
+com.android.tools.r8.com.google.common.collect.BaseImmutableMultimap -> com.android.tools.r8.internal.E4:
     1:1:void <init>():25:25 -> <init>
-com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.T4:
+com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.V4:
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
-    com.android.tools.r8.com.google.common.collect.BiMap inverse() -> h
-com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.k6:
+    com.android.tools.r8.com.google.common.collect.BiMap inverse() -> i
+com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.m6:
     com.android.tools.r8.com.google.common.collect.Ordering ordering -> c
     com.android.tools.r8.com.google.common.base.Function function -> 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>
@@ -9648,11 +9689,11 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):77:77 -> hashCode
     2:2:int hashCode():60 -> hashCode
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.gc:
+com.android.tools.r8.com.google.common.collect.CollectPreconditions -> com.android.tools.r8.internal.jc:
     1:1:void checkEntryNotNull(java.lang.Object,java.lang.Object):32:32 -> a
     2:2:void checkEntryNotNull(java.lang.Object,java.lang.Object):30:30 -> a
     3:3:int checkNonnegative(int,java.lang.String):39:39 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.nc:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators -> com.android.tools.r8.internal.qc:
     1:1:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction,java.util.Comparator):98:98 -> a
     1:1:java.util.Spliterator indexed(int,int,java.util.function.IntFunction):42 -> a
     2:2:java.util.Spliterator map(java.util.Spliterator,java.util.function.Function):108:108 -> a
@@ -9667,7 +9708,7 @@
     11:11:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
     11:11:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):213 -> a
     12:12:java.util.Spliterator flatMap(java.util.Spliterator,java.util.function.Function,int,long):214:214 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.hc:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.kc:
     java.util.Spliterator val$fromSpliterator -> a
     java.util.function.Function val$function -> b
     1:1:void <init>(java.util.Spliterator,java.util.function.Function):110:110 -> <init>
@@ -9678,7 +9719,7 @@
     1:1:void forEachRemaining(java.util.function.Consumer):120:120 -> forEachRemaining
     1:1:boolean tryAdvance(java.util.function.Consumer):114:114 -> tryAdvance
     1:2:java.util.Spliterator trySplit():125:126 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.ic:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.lc:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -9696,7 +9737,7 @@
     4:4:java.util.Spliterator trySplit():172 -> trySplit
     5:5:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):194:194 -> trySplit
     5:5:java.util.Spliterator trySplit():172 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.jc:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.mc:
     java.util.function.IntFunction val$function -> b
     java.util.Spliterator$OfInt delegate -> a
     java.util.Comparator val$comparator -> d
@@ -9710,7 +9751,7 @@
     1:4:java.util.Comparator getComparator():91:94 -> getComparator
     1:1:boolean tryAdvance(java.util.function.Consumer):62:62 -> tryAdvance
     1:2:java.util.Spliterator trySplit():72:73 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator -> com.android.tools.r8.internal.lc:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator -> com.android.tools.r8.internal.oc:
     long estimatedSize -> f
     java.util.function.Function function -> c
     java.util.Spliterator from -> b
@@ -9725,18 +9766,18 @@
     1:12:void forEachRemaining(java.util.function.Consumer):353:364 -> forEachRemaining
     1:9:boolean tryAdvance(java.util.function.Consumer):337:345 -> tryAdvance
     1:17:java.util.Spliterator trySplit():369:385 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory -> com.android.tools.r8.internal.kc:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliterator$Factory -> com.android.tools.r8.internal.nc:
     java.util.Spliterator newFlatMapSpliterator(java.util.Spliterator,java.util.Spliterator,java.util.function.Function,int,long) -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliteratorOfObject -> com.android.tools.r8.internal.mc:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$FlatMapSpliteratorOfObject -> com.android.tools.r8.internal.pc:
     1:1:void <init>(java.util.Spliterator,java.util.Spliterator,java.util.function.Function,int,long):425:425 -> <init>
-com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.Dc:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.Gc:
     java.util.Comparator comparator -> b
     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.ConcurrentHashMultiset -> com.android.tools.r8.internal.Fd:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset -> com.android.tools.r8.internal.Id:
     java.util.concurrent.ConcurrentMap countMap -> d
     1:3:void <init>(java.util.concurrent.ConcurrentMap):126:128 -> <init>
     1:1:java.util.concurrent.ConcurrentMap access$100(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):59:59 -> a
@@ -9811,7 +9852,7 @@
     22:25:java.util.List com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset.snapshot():181:184 -> toArray
     22:25:java.lang.Object[] toArray(java.lang.Object[]):172 -> toArray
     26:26:java.lang.Object[] toArray(java.lang.Object[]):172:172 -> toArray
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1 -> com.android.tools.r8.internal.Bd:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1 -> com.android.tools.r8.internal.Ed:
     java.util.Set val$delegate -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset,java.util.Set):450:450 -> <init>
     1:1:boolean contains(java.lang.Object):458:458 -> contains
@@ -9840,7 +9881,7 @@
     2:2:boolean removeAll(java.util.Collection):473 -> removeAll
     3:3:boolean com.android.tools.r8.com.google.common.collect.ForwardingSet.standardRemoveAll(java.util.Collection):77:77 -> removeAll
     3:3:boolean removeAll(java.util.Collection):473 -> removeAll
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2 -> com.android.tools.r8.internal.Cd:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2 -> com.android.tools.r8.internal.Fd:
     java.util.Iterator mapEntries -> d
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):505:507 -> <init>
     1:7:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2.computeNext():512:518 -> j
@@ -9848,7 +9889,7 @@
     8:8:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multisets.immutableEntry(java.lang.Object,int):235:235 -> j
     8:8:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$2.computeNext():518 -> j
     8:8:java.lang.Object computeNext():505 -> j
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3 -> com.android.tools.r8.internal.Dd:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3 -> com.android.tools.r8.internal.Gd:
     java.util.Iterator val$readOnlyIterator -> c
     com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset this$0 -> d
     com.android.tools.r8.com.google.common.collect.Multiset$Entry last -> b
@@ -9861,7 +9902,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():540 -> remove
     3:4:void remove():541:542 -> remove
-com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$EntrySet -> com.android.tools.r8.internal.Ed:
+com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$EntrySet -> com.android.tools.r8.internal.Hd:
     com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset):558:558 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset,com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$1):558:558 -> <init>
@@ -9905,7 +9946,7 @@
     19:19:java.util.List com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$EntrySet.snapshot():582:582 -> toArray
     19:19:java.lang.Object[] toArray(java.lang.Object[]):576 -> toArray
     20:20:java.lang.Object[] toArray(java.lang.Object[]):576:576 -> toArray
-com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.we:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.ze:
     int value -> b
     1:2:void <init>(int):30:31 -> <init>
     1:1:void add(int):39:39 -> a
@@ -9916,11 +9957,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.yi:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.Ci:
     com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap INSTANCE -> h
     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.zl:
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.El:
     com.android.tools.r8.com.google.common.base.Optional iterableDelegate -> b
     1:2:void <init>():118:119 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.FluentIterable concat(java.lang.Iterable,java.lang.Iterable):191:191 -> a
@@ -9962,7 +10003,7 @@
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterators.toString(java.util.Iterator):281:290 -> toString
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterables.toString(java.lang.Iterable):241 -> toString
     3:12:java.lang.String toString():337 -> toString
-com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.wl:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.Bl:
     java.lang.Iterable val$inputs -> c
     1:1:void <init>(java.lang.Iterable):274:274 -> <init>
     1:1:java.util.Iterator iterator():277:277 -> iterator
@@ -9972,18 +10013,18 @@
     3:4:java.util.Iterator iterator():277 -> iterator
     5:5:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):546:546 -> iterator
     5:5:java.util.Iterator iterator():277 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.yl:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.Dl:
     java.lang.Iterable[] val$inputs -> c
     1:1:void <init>(java.lang.Iterable[]):288:288 -> <init>
     1:1:java.util.Iterator iterator():291:291 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):546:546 -> iterator
     2:2:java.util.Iterator iterator():291 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$3$1 -> com.android.tools.r8.internal.xl:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3$1 -> com.android.tools.r8.internal.Cl:
     com.android.tools.r8.com.google.common.collect.FluentIterable$3 this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.FluentIterable$3,int):293:293 -> <init>
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.FluentIterable$3$1.get(int):296:296 -> a
     1:1:java.lang.Object get(int):293 -> a
-com.android.tools.r8.com.google.common.collect.ForwardingIterator -> com.android.tools.r8.internal.Jl:
+com.android.tools.r8.com.google.common.collect.ForwardingIterator -> com.android.tools.r8.internal.Ol:
     1:1:void <init>():42:42 -> <init>
     1:1:boolean hasNext():49:49 -> hasNext
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3.delegate():529:529 -> hasNext
@@ -9993,11 +10034,11 @@
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.ConcurrentHashMultiset$3.delegate():529:529 -> next
     2:2:java.lang.Object next():55 -> next
     3:3:java.lang.Object next():55:55 -> next
-com.android.tools.r8.com.google.common.collect.ForwardingObject -> com.android.tools.r8.internal.Kl:
+com.android.tools.r8.com.google.common.collect.ForwardingObject -> com.android.tools.r8.internal.Pl:
     1:1:void <init>():50:50 -> <init>
     java.lang.Object delegate() -> j
     1:1:java.lang.String toString():63:63 -> toString
-com.android.tools.r8.com.google.common.collect.ForwardingSet -> com.android.tools.r8.internal.Ll:
+com.android.tools.r8.com.google.common.collect.ForwardingSet -> com.android.tools.r8.internal.Ql:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingCollection.<init>():53:53 -> <init>
     1:1:void <init>():53 -> <init>
     boolean com.android.tools.r8.com.google.common.collect.ForwardingCollection.standardContainsAll(java.util.Collection) -> a
@@ -10111,7 +10152,7 @@
     6:6:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ForwardingCollection.toArray(java.lang.Object[]):126:126 -> toArray
     6:6:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ForwardingCollection.toArray(java.lang.Object[]):0 -> toArray
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.nn:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.sn:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry firstInKeyInsertionOrder -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry lastInKeyInsertionOrder -> e
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] hashTableKToV -> b
@@ -10165,22 +10206,22 @@
     2:2:void forEach(java.util.function.BiConsumer):547 -> forEach
     3:6:void forEach(java.util.function.BiConsumer):548:551 -> forEach
     7:7:void forEach(java.util.function.BiConsumer):550:550 -> forEach
-    1:1:java.util.Iterator entryIterator():498:498 -> g
     1:1:java.lang.Object get(java.lang.Object):270:270 -> get
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.valueOrNull(java.util.Map$Entry):3684:3684 -> get
     2:2:java.lang.Object get(java.lang.Object):270 -> get
-    1:2:com.android.tools.r8.com.google.common.collect.BiMap inverse():569:570 -> h
+    1:1:java.util.Iterator entryIterator():498:498 -> h
+    1:2:com.android.tools.r8.com.google.common.collect.BiMap inverse():569:570 -> i
     1:1:java.util.Set keySet():459:459 -> keySet
-    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap com.android.tools.r8.com.google.common.collect.HashBiMap.create(int):74:74 -> l
-    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create():64 -> l
-    1:3:void rehashIfNecessary():364:366 -> m
-    4:4:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] com.android.tools.r8.com.google.common.collect.HashBiMap.createTable(int):384:384 -> m
-    4:4:void rehashIfNecessary():368 -> m
-    5:5:void rehashIfNecessary():368:368 -> m
-    6:6:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] com.android.tools.r8.com.google.common.collect.HashBiMap.createTable(int):384:384 -> m
-    6:6:void rehashIfNecessary():369 -> m
-    7:14:void rehashIfNecessary():369:376 -> m
-    15:18:void rehashIfNecessary():375:378 -> m
+    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap com.android.tools.r8.com.google.common.collect.HashBiMap.create(int):74:74 -> m
+    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create():64 -> m
+    1:3:void rehashIfNecessary():364:366 -> n
+    4:4:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] com.android.tools.r8.com.google.common.collect.HashBiMap.createTable(int):384:384 -> n
+    4:4:void rehashIfNecessary():368 -> n
+    5:5:void rehashIfNecessary():368:368 -> n
+    6:6:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] com.android.tools.r8.com.google.common.collect.HashBiMap.createTable(int):384:384 -> n
+    6:6:void rehashIfNecessary():369 -> n
+    7:14:void rehashIfNecessary():369:376 -> n
+    15:18:void rehashIfNecessary():375:378 -> n
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):276:276 -> put
     1:8:java.lang.Object remove(java.lang.Object):390:397 -> remove
     1:1:void replaceAll(java.util.function.BiFunction):557:557 -> replaceAll
@@ -10196,19 +10237,19 @@
     2:2:java.util.Set values():493:493 -> values
     3:3:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.keySet():630:630 -> values
     3:3:java.util.Set values():493 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.dn:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.in:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):498:498 -> <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):501:501 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):498 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.cn:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.hn:
     com.android.tools.r8.com.google.common.collect.HashBiMap$1 this$1 -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):507:508 -> <init>
     1:1:java.lang.Object getKey():513:513 -> getKey
     1:1:java.lang.Object getValue():518:518 -> getValue
     1:16:java.lang.Object setValue(java.lang.Object):523:538 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.en:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.jn:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKToVBucket -> f
     int keyHash -> d
     int valueHash -> e
@@ -10216,7 +10257,7 @@
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKeyInsertionOrder -> h
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry prevInKeyInsertionOrder -> i
     1:3:void <init>(java.lang.Object,int,java.lang.Object,int):104:106 -> <init>
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.jn:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.on:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):573:573 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap,com.android.tools.r8.com.google.common.collect.HashBiMap$1):573:573 -> <init>
@@ -10232,12 +10273,12 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> forEach
     2:2:void forEach(java.util.function.BiConsumer):712 -> forEach
     3:3:void forEach(java.util.function.BiConsumer):713:713 -> forEach
-    1:1:java.util.Iterator entryIterator():667:667 -> g
     1:1:java.lang.Object get(java.lang.Object):596:596 -> get
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.keyOrNull(java.util.Map$Entry):3680:3680 -> get
     2:2:java.lang.Object get(java.lang.Object):596 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.forward():576:576 -> h
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():625 -> h
+    1:1:java.util.Iterator entryIterator():667:667 -> h
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.forward():576:576 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():625 -> i
     1:1:java.util.Set keySet():630:630 -> keySet
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):602:602 -> put
     1:8:java.lang.Object remove(java.lang.Object):612:619 -> remove
@@ -10263,27 +10304,27 @@
     4:4:java.util.Set values():662:662 -> values
     5:5:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap.keySet():459:459 -> values
     5:5:java.util.Set values():662 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.gn:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.ln:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> g
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):667:667 -> <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):670:670 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):667 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.fn:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.kn:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 this$2 -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> 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):676:677 -> <init>
     1:1:java.lang.Object getKey():682:682 -> getKey
     1:1:java.lang.Object getValue():687:687 -> getValue
     1:12:java.lang.Object setValue(java.lang.Object):692:703 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.in:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.nn:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):634:635 -> <init>
     1:1:java.util.Iterator iterator():651:651 -> iterator
     1:5:boolean remove(java.lang.Object):640:644 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.hn:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.mn:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet):651:651 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):654:654 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.kn:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.pn:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry toRemove -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> f
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry next -> b
@@ -10300,47 +10341,47 @@
     5:5:void remove():448 -> remove
     6:8:void remove():449:451 -> remove
     9:9:void remove():446:446 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.mn:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.rn:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):463:464 -> <init>
     1:1:java.util.Iterator iterator():469:469 -> iterator
     1:7:boolean remove(java.lang.Object):479:485 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.ln:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.qn:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet):469:469 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):472:472 -> a
-com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.un:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.zn:
     1:1:void <init>():66:66 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.HashMultiset create():38:38 -> f
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.isEmpty():50:50 -> isEmpty
     1:1:boolean isEmpty():33 -> isEmpty
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.iterator():185:185 -> iterator
     1:1:java.util.Iterator iterator():33 -> iterator
-com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.An:
+com.android.tools.r8.com.google.common.collect.Hashing -> com.android.tools.r8.internal.Fn:
     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.Mo:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.Ro:
     1:1:void <init>():34:34 -> <init>
     1:1:boolean contains(java.lang.Object):41:41 -> contains
     1:1:boolean isPartialView():56:56 -> e
     1:1:boolean isEmpty():51:51 -> isEmpty
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection() -> j
     1:1:int size():46:46 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.Oo:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.To:
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim.<init>():32:32 -> <init>
     1:1:void <init>():372 -> <init>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):407:407 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap.inverse():30:30 -> h
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.createValues():393:393 -> m
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():41 -> m
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():388:388 -> t
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():41 -> t
-    com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse() -> u
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap.inverse():30:30 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.createValues():393:393 -> n
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():41 -> n
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():388:388 -> u
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():41 -> u
+    com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse() -> v
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():388:388 -> values
     1:1:java.util.Collection values():41 -> values
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():388:388 -> values
     2:2:java.util.Set values():41 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.No:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.So:
     1:1:void <init>():176:176 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder orderEntriesByValue(java.util.Comparator) -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap build():170:170 -> a
@@ -10358,7 +10399,7 @@
     33:33: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):72:72 -> b
     33:33:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():272 -> b
     34:34:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():270:270 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Qo:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Vo:
     java.lang.Object[] EMPTY_ARRAY -> b
     1:1:void <clinit>():187:187 -> <clinit>
     1:1:void <init>():176:176 -> <init>
@@ -10395,18 +10436,18 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> toArray
     3:3:java.lang.Object[] toArray(java.lang.Object[]):197 -> toArray
     4:15:java.lang.Object[] toArray(java.lang.Object[]):198:209 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Po:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Uo:
     1:1:void <init>():404:404 -> <init>
     1:1:int expandedCapacity(int,int):395:395 -> a
     2:2:int expandedCapacity(int,int):390:390 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.So:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.Xo:
     java.lang.Object key -> b
     java.lang.Object value -> c
     1:3:void <init>(java.lang.Object,java.lang.Object):29:31 -> <init>
     1:1:java.lang.Object getKey():36:36 -> getKey
     1:1:java.lang.Object getValue():41:41 -> getValue
     1:1:java.lang.Object setValue(java.lang.Object):46:46 -> setValue
-com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.To:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.Yo:
     java.util.EnumMap delegate -> f
     1:3:void <init>(java.util.EnumMap):51:53 -> <init>
     1:8:com.android.tools.r8.com.google.common.collect.ImmutableMap asImmutable(java.util.EnumMap):38:45 -> a
@@ -10419,21 +10460,21 @@
     1:4:boolean equals(java.lang.Object):86:89 -> equals
     1:1:void forEach(java.util.function.BiConsumer):104:104 -> forEach
     1:1:java.lang.Object get(java.lang.Object):78:78 -> get
-    boolean isPartialView() -> o
-    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58:58 -> p
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):127:127 -> p
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58 -> p
-    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> p
-    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):127 -> p
-    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58 -> p
-    4:9:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):128:133 -> p
-    4:9:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58 -> p
-    1:1:java.util.Spliterator keySpliterator():63:63 -> r
+    boolean isPartialView() -> p
+    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58:58 -> q
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):127:127 -> q
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58 -> q
+    3:3:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> q
+    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):127 -> q
+    3:3:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58 -> q
+    4:9:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.unmodifiableIterator(java.util.Iterator):128:133 -> q
+    4:9:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58 -> q
+    1:1:java.util.Spliterator keySpliterator():63:63 -> s
     1:1:int size():68:68 -> size
-    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94:94 -> u
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntryIterator(java.util.Iterator):1361:1361 -> u
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94 -> u
-com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.Uo:
+    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94:94 -> v
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntryIterator(java.util.Iterator):1361:1361 -> v
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94 -> v
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.Zo:
     java.util.EnumSet delegate -> e
     int hashCode -> f
     1:2:void <init>(java.util.EnumSet):57:58 -> <init>
@@ -10461,7 +10502,7 @@
     1:1:int size():83:83 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
     1:1:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.bp:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.gp:
     int $r8$clinit -> c
     1:1:void <init>():377:377 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> a
@@ -10593,11 +10634,11 @@
     1:1:void sort(java.util.Comparator):565:565 -> sort
     1:1:java.util.Spliterator spliterator():580:580 -> spliterator
     1:1:java.util.List subList(int,int):60:60 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.Xo:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.cp:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> d
     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.Yo:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.dp:
     java.lang.Object[] contents -> a
     int size -> b
     boolean forceCopy -> c
@@ -10619,7 +10660,7 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):793 -> b
     3:4:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):794:795 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.Zo:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.ep:
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):607:608 -> <init>
     1:1:boolean contains(java.lang.Object):626:626 -> contains
@@ -10655,7 +10696,7 @@
     2:2:java.util.ListIterator listIterator(int):604:604 -> listIterator
     1:1:int size():655:655 -> size
     1:1:java.util.List subList(int,int):604:604 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.ap:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.fp:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> f
     int offset -> d
     int length -> e
@@ -10671,14 +10712,14 @@
     2:2:java.util.ListIterator listIterator(int):455:455 -> listIterator
     1:1:int size():466:466 -> size
     1:1:java.util.List subList(int,int):455:455 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.dp:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.ip:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):377:377 -> <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):390:391 -> get
     1:2:java.util.Collection get(java.lang.Object):50 -> get
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():83:83 -> 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):391 -> get
     3:3:java.util.Collection get(java.lang.Object):50 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.cp:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.hp:
     1:1:void <init>():213:213 -> <init>
     1:4: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):162:165 -> a
     1:4:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder put(java.lang.Object,java.lang.Object):218 -> a
@@ -10699,7 +10740,7 @@
     12:29:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.fromMapEntries(java.util.Collection,java.util.Comparator):356:373 -> a
     12:29:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():292 -> a
     12:29:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():302 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.ip:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.np:
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> e
     com.android.tools.r8.com.google.common.collect.ImmutableCollection values -> d
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> b
@@ -10750,32 +10791,31 @@
     1:1:java.util.Set entrySet():63:63 -> entrySet
     1:3:boolean com.android.tools.r8.com.google.common.collect.Maps.equalsImpl(java.util.Map,java.lang.Object):3598:3600 -> equals
     1:3:boolean equals(java.lang.Object):878 -> equals
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():180:180 -> g
-    2:2:void com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.<init>():255:255 -> g
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():180 -> g
     1:1:java.lang.Object getOrDefault(java.lang.Object,java.lang.Object):713:713 -> getOrDefault
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():180:180 -> h
+    2:2:void com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.<init>():255:255 -> h
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():180 -> h
     1:1:int hashCode():885:885 -> hashCode
     1:1:boolean isEmpty():689:689 -> isEmpty
-    com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet() -> k
     1:1:java.util.Set keySet():63:63 -> keySet
-    com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet() -> l
-    com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues() -> m
+    com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet() -> l
+    com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet() -> m
     1:1:java.lang.Object merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction):619:619 -> merge
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():725:726 -> n
-    boolean isPartialView() -> o
-    1:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():751:752 -> p
+    com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues() -> n
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():725:726 -> o
+    boolean isPartialView() -> p
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):525:525 -> put
     1:1:void putAll(java.util.Map):632:632 -> putAll
     1:1:java.lang.Object putIfAbsent(java.lang.Object,java.lang.Object):539:539 -> putIfAbsent
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():739:740 -> q
-    1:1:java.util.Spliterator keySpliterator():766:766 -> r
+    1:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():751:752 -> q
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():739:740 -> r
     1:1:java.lang.Object remove(java.lang.Object):658:658 -> remove
     2:2:boolean remove(java.lang.Object,java.lang.Object):671:671 -> remove
     1:1:boolean replace(java.lang.Object,java.lang.Object,java.lang.Object):552:552 -> replace
     2:2:java.lang.Object replace(java.lang.Object,java.lang.Object):565:565 -> replace
     1:1:void replaceAll(java.util.function.BiFunction):645:645 -> replaceAll
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of():110:110 -> s
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():777:778 -> t
+    1:1:java.util.Spliterator keySpliterator():766:766 -> s
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of():110:110 -> t
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3607:3607 -> toString
     1:1:java.lang.String toString():894 -> toString
     2:3:java.lang.StringBuilder com.android.tools.r8.com.google.common.collect.Collections2.newStringBuilderForCollection(int):351:352 -> toString
@@ -10783,13 +10823,14 @@
     2:3:java.lang.String toString():894 -> toString
     4:13:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3607:3616 -> toString
     4:13:java.lang.String toString():894 -> toString
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():777:778 -> u
     1:1:java.util.Collection values():63:63 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.ep:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.jp:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator val$entryIterator -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.UnmodifiableIterator):752:752 -> <init>
     1:1:boolean hasNext():755:755 -> hasNext
     1:1:java.lang.Object next():760:760 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.fp:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.kp:
     java.util.Map$Entry[] entries -> b
     int size -> c
     java.util.Comparator valueComparator -> a
@@ -10819,37 +10860,37 @@
     37:37: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):119 -> a
     37:37:com.android.tools.r8.com.google.common.collect.ImmutableMap build():386 -> a
     38:38:com.android.tools.r8.com.google.common.collect.ImmutableMap build():384:384 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap -> com.android.tools.r8.internal.hp:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap -> com.android.tools.r8.internal.mp:
     1:1:void <init>():475:475 -> <init>
     1:1:java.util.Set entrySet():475:475 -> entrySet
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():503:503 -> k
     1:1:java.util.Set keySet():475:475 -> keySet
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():487:487 -> l
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():508:508 -> m
-    com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator() -> u
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():503:503 -> l
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():487:487 -> m
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():508:508 -> n
+    com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator() -> v
     1:1:java.util.Collection values():475:475 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.gp:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.lp:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap):492:492 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():500:500 -> f
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl.iterator():500:500 -> iterator
     1:1:java.util.Iterator iterator():492 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():495:495 -> k
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.lp:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.qp:
     1:2:void <init>(java.lang.Object,java.lang.Object):47:48 -> <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.jp:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.op:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInValueBucket -> e
     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):102:103 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():109:109 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.kp:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.pp:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInKeyBucket -> d
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):78:79 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():84:84 -> b
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.np:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.sp:
     1:1:void <init>():80:80 -> <init>
     1:4:boolean contains(java.lang.Object):91:94 -> contains
     1:1:boolean isPartialView():101:101 -> e
@@ -10859,7 +10900,7 @@
     2:2:boolean isHashCodeFast():107 -> i
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> k
     1:1:int size():86:86 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.mp:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.rp:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> f
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableList):43:45 -> <init>
@@ -10871,7 +10912,7 @@
     1:1:java.util.Iterator iterator():35 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():50:50 -> k
     1:1:java.util.Spliterator spliterator():66:66 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.op:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.tp:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):38:39 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):70:70 -> a
@@ -10887,7 +10928,7 @@
     1:1:java.util.Iterator iterator():34 -> iterator
     1:1:int size():44:44 -> size
     1:1:java.util.Spliterator spliterator():54:54 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.rp:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.wp:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):39:40 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):36:36 -> a
@@ -10914,18 +10955,18 @@
     1:1:java.util.Iterator iterator():35 -> iterator
     1:1:int size():45:45 -> 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.pp:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.up:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryItr -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):50:51 -> <init>
     1:1:boolean hasNext():55:55 -> hasNext
     1:1:java.lang.Object next():60:60 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.qp:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.vp:
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> d
     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 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.wp:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.Bp:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> f
     int size -> g
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):345:347 -> <init>
@@ -10965,7 +11006,7 @@
     1:1:int size():482:482 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():263:263 -> toString
     1:1:java.lang.String toString():68 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.sp:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.xp:
     java.util.Iterator valueItr -> d
     java.util.Iterator asMapItr -> b
     java.lang.Object currentKey -> c
@@ -10976,10 +11017,10 @@
     7:7:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1320:1320 -> next
     7:7:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.next():581 -> next
     7:7:java.lang.Object next():563 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.tp:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.yp:
     java.util.Map builderMap -> a
     1:2:void <init>():151:152 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.up:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.zp:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap multimap -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):530:531 -> <init>
     1:3:boolean contains(java.lang.Object):551:553 -> contains
@@ -10996,7 +11037,7 @@
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():482:482 -> size
     2:2:int size():546 -> size
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.vp:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.Ap:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> f
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):625:625 -> <init>
     1:1:boolean contains(java.lang.Object):628:628 -> contains
@@ -11020,7 +11061,7 @@
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():482:482 -> size
     2:2:int size():644 -> size
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.Bp:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.Gp:
     int $r8$clinit -> e
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
@@ -11051,14 +11092,14 @@
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():353:353 -> i
     1:1:java.lang.String toString():341:341 -> toString
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys.elementSet():623:623 -> x
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.xp:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.Cp:
     java.util.Iterator val$entryIterator -> d
     java.lang.Object element -> c
     int remaining -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,java.util.Iterator):228:228 -> <init>
     1:1:boolean hasNext():234:234 -> hasNext
     1:7:java.lang.Object next():239:245 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.yp:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder -> com.android.tools.r8.internal.Dp:
     com.android.tools.r8.com.google.common.collect.Multiset contents -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):463:464 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMultiset$Builder add(java.lang.Object):477:477 -> a
@@ -11078,7 +11119,7 @@
     21:21: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
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableMultiset com.android.tools.r8.com.google.common.collect.ImmutableMultiset.copyOf(java.lang.Iterable):193 -> a
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableMultiset build():567 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$ElementSet -> com.android.tools.r8.internal.zp:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Ep:
     java.util.List entries -> e
     com.android.tools.r8.com.google.common.collect.Multiset delegate -> f
     1:3:void <init>(java.util.List,com.android.tools.r8.com.google.common.collect.Multiset):584:586 -> <init>
@@ -11086,7 +11127,7 @@
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):591:591 -> get
     1:1:int size():606:606 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.Ap:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.Fp:
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset):363:363 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1):363:363 -> <init>
@@ -11096,7 +11137,7 @@
     1:1:java.lang.Object get(int):362 -> get
     1:1:int hashCode():394:394 -> hashCode
     1:1:int size():376:376 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.Ip:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.Np:
     int $r8$clinit -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
     1:1:void <init>():302:302 -> <init>
@@ -11147,7 +11188,7 @@
     boolean isHashCodeFast() -> i
     1:13:int chooseTableSize(int):643:655 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():75:75 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.Cp:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.Hp:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl impl -> a
     boolean forceCopy -> b
     1:1:void <init>():481:481 -> <init>
@@ -11175,7 +11216,7 @@
     5:5:void com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.copyIfNecessary():500:500 -> b
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):512 -> b
     6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):513:513 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.Ep:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.Jp:
     1:1:void <init>():345:345 -> <init>
     1:1:int copyIntoArray(java.lang.Object[],int):369:369 -> a
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():350:350 -> f
@@ -11187,13 +11228,13 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed.iterator():350:350 -> iterator
     1:1:java.util.Iterator iterator():345 -> iterator
     1:1:java.util.Spliterator spliterator():355:355 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.Dp:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.Ip:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):374:374 -> <init>
     1:1:java.lang.Object get(int):377:377 -> 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():382:382 -> j
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():374 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableSet$JdkBackedSetBuilderImpl -> com.android.tools.r8.internal.Fp:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$JdkBackedSetBuilderImpl -> com.android.tools.r8.internal.Kp:
     java.util.Set delegate -> c
     1:4:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl):847:850 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl add(java.lang.Object):856:856 -> a
@@ -11208,7 +11249,7 @@
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():75:75 -> a
     16:16:com.android.tools.r8.com.google.common.collect.ImmutableSet build():872 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl copy():865:865 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableSet$RegularSetBuilderImpl -> com.android.tools.r8.internal.Gp:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$RegularSetBuilderImpl -> com.android.tools.r8.internal.Lp:
     java.lang.Object[] hashTable -> c
     int hashCode -> f
     int maxRunBeforeFallback -> d
@@ -11239,7 +11280,7 @@
     4:12:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ImmutableSet.rebuildHashTable(int,java.lang.Object[],int):442:450 -> c
     4:12:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():816 -> c
     13:17:com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review():816:820 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl -> com.android.tools.r8.internal.Hp:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl -> com.android.tools.r8.internal.Mp:
     java.lang.Object[] dedupedElements -> a
     int distinct -> b
     1:3:void <init>(int):566:568 -> <init>
@@ -11252,7 +11293,7 @@
     2:5:void addDedupedElement(java.lang.Object):591 -> b
     6:6:void addDedupedElement(java.lang.Object):592:592 -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet$SetBuilderImpl review() -> c
-com.android.tools.r8.com.google.common.collect.IndexedImmutableSet -> com.android.tools.r8.internal.Vp:
+com.android.tools.r8.com.google.common.collect.IndexedImmutableSet -> com.android.tools.r8.internal.aq:
     1:1:void <init>():27:27 -> <init>
     1:1:int copyIntoArray(java.lang.Object[],int):52:52 -> a
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():32:32 -> f
@@ -11262,14 +11303,14 @@
     3:5:void forEach(java.util.function.Consumer):43:45 -> forEach
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():57:57 -> h
     1:1:java.util.Spliterator spliterator():37:37 -> spliterator
-com.android.tools.r8.com.google.common.collect.IndexedImmutableSet$1 -> com.android.tools.r8.internal.Up:
+com.android.tools.r8.com.google.common.collect.IndexedImmutableSet$1 -> com.android.tools.r8.internal.Zp:
     com.android.tools.r8.com.google.common.collect.IndexedImmutableSet this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.IndexedImmutableSet):57:57 -> <init>
     1:1:boolean isPartialView():65:65 -> e
     1:1:java.lang.Object get(int):60:60 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():75:75 -> j
     1:1:int size():70:70 -> size
-com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.Bw:
+com.android.tools.r8.com.google.common.collect.Iterables -> com.android.tools.r8.internal.Hw:
     1:2:boolean contains(java.lang.Iterable,java.lang.Object):136:137 -> a
     3:5:boolean com.android.tools.r8.com.google.common.collect.Collections2.safeContains(java.util.Collection,java.lang.Object):101:103 -> a
     3:5:boolean contains(java.lang.Iterable,java.lang.Object):138 -> a
@@ -11335,12 +11376,12 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> d
     2:2:java.lang.Iterable skip(java.lang.Iterable,int):852 -> d
     3:5:java.lang.Iterable skip(java.lang.Iterable,int):853:855 -> d
-com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.ww:
+com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.Cw:
     1:1:void <init>():1023:1023 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):1023:1023 -> apply
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$10.apply(java.lang.Iterable):1026:1026 -> apply
     2:2:java.lang.Object apply(java.lang.Object):1023 -> apply
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.xw:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.Dw:
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> d
     java.lang.Iterable val$unfiltered -> c
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):556:556 -> <init>
@@ -11371,7 +11412,7 @@
     4:4:java.util.Spliterator spliterator():575 -> spliterator
     5:5:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):194:194 -> spliterator
     5:5:java.util.Spliterator spliterator():575 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.yw:
+com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.Ew:
     java.lang.Iterable val$fromIterable -> c
     com.android.tools.r8.com.google.common.base.Function val$function -> d
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):695:695 -> <init>
@@ -11389,7 +11430,7 @@
     4:4: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):780:780 -> iterator
     4:4:java.util.Iterator iterator():698 -> iterator
     1:1:java.util.Spliterator spliterator():709:709 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.Aw:
+com.android.tools.r8.com.google.common.collect.Iterables$6 -> com.android.tools.r8.internal.Gw:
     int val$numberToSkip -> d
     java.lang.Iterable val$iterable -> c
     1:1:void <init>(java.lang.Iterable,int):855:855 -> <init>
@@ -11403,7 +11444,7 @@
     11:15:java.util.Iterator iterator():865 -> iterator
     16:16:java.util.Iterator iterator():872:872 -> iterator
     1:6:java.util.Spliterator spliterator():897:902 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.zw:
+com.android.tools.r8.com.google.common.collect.Iterables$6$1 -> com.android.tools.r8.internal.Fw:
     java.util.Iterator val$iterator -> c
     boolean atStart -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Iterables$6,java.util.Iterator):872:873 -> <init>
@@ -11413,7 +11454,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():889 -> remove
     3:3:void remove():890:890 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.Pw:
+com.android.tools.r8.com.google.common.collect.Iterators -> com.android.tools.r8.internal.Vw:
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.Iterators.emptyListIterator():88:88 -> a
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator emptyIterator():77 -> a
     2:2:boolean addAll(java.util.Collection,java.util.Iterator):352:352 -> a
@@ -11455,35 +11496,35 @@
     33:33:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator forArray(java.lang.Object[]):1001 -> a
     34:34:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator singletonIterator(java.lang.Object):1049:1049 -> a
     1:5:boolean removeAll(java.util.Iterator,java.util.Collection):198:202 -> b
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.Fw:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.Lw:
     java.util.Iterator val$iterator -> b
     1:1:void <init>(java.util.Iterator):133:133 -> <init>
     1:1:boolean hasNext():136:136 -> hasNext
     1:1:java.lang.Object next():141:141 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.Gw:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.Mw:
     java.util.Iterator iterator -> b
     java.lang.Iterable val$iterable -> c
     1:2:void <init>(java.lang.Iterable):391:392 -> <init>
     1:1:boolean hasNext():405:405 -> hasNext
     1:7:java.lang.Object next():410:416 -> next
     1:1:void remove():421:421 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.Hw:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.Nw:
     java.lang.Object[] val$elements -> c
     int index -> b
     1:2:void <init>(java.lang.Object[]):450:451 -> <init>
     1:1:boolean hasNext():455:455 -> hasNext
     1:6:java.lang.Object next():460:465 -> next
     7:7:java.lang.Object next():461:461 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.Iw:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.Ow:
     java.util.Iterator val$unfiltered -> d
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> e
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):632:632 -> <init>
     1:7:java.lang.Object computeNext():635:641 -> j
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.Jw:
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.Pw:
     com.android.tools.r8.com.google.common.base.Function val$function -> c
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):780:780 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):783:783 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.Kw:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.Qw:
     java.util.Iterator val$iterator -> d
     int count -> b
     int val$limitSize -> c
@@ -11492,21 +11533,21 @@
     1:5:java.lang.Object next():917:921 -> next
     6:6:java.lang.Object next():918:918 -> next
     1:1:void remove():926:926 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.Lw:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.Rw:
     java.lang.Object val$value -> c
     boolean done -> b
     1:1:void <init>(java.lang.Object):1049:1049 -> <init>
     1:1:boolean hasNext():1054:1054 -> hasNext
     1:5:java.lang.Object next():1059:1063 -> next
     6:6:java.lang.Object next():1060:1060 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.Mw:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.Sw:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> f
     int offset -> e
     1:1:void <clinit>():1026:1026 -> <clinit>
     1:3:void <init>(java.lang.Object[],int,int,int):1032:1034 -> <init>
     1:1:java.lang.Object get(int):1039:1039 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.Nw:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.Tw:
     java.util.Iterator topMetaIterator -> d
     java.util.Iterator iterator -> c
     java.util.Iterator toRemove -> b
@@ -11526,14 +11567,14 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():1372 -> remove
     3:4:void remove():1373:1374 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.Ow:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.Uw:
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> b
     1:1:void <clinit>():96:96 -> <clinit>
     1:1:void <init>(java.lang.String,int):95:95 -> <init>
     1:1:java.lang.Object next():105:105 -> next
     1:1:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     1:1:void remove():110 -> remove
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap -> com.android.tools.r8.internal.Xw:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap -> com.android.tools.r8.internal.dx:
     com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap inverse -> i
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> f
     java.util.Map forwardDelegate -> g
@@ -11565,12 +11606,12 @@
     21:21:com.android.tools.r8.com.google.common.collect.ImmutableBiMap create(int,java.util.Map$Entry[]):41 -> a
     22:30:com.android.tools.r8.com.google.common.collect.ImmutableBiMap create(int,java.util.Map$Entry[]):41:49 -> a
     1:1:java.lang.Object get(java.lang.Object):104:104 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():109:109 -> k
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():114:114 -> l
-    boolean isPartialView() -> o
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():109:109 -> l
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():114:114 -> m
+    boolean isPartialView() -> p
     1:1:int size():65:65 -> size
-    1:7:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():72:78 -> u
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$InverseEntries -> com.android.tools.r8.internal.Ww:
+    1:7:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():72:78 -> v
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$InverseEntries -> com.android.tools.r8.internal.cx:
     com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap):84:84 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap,com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$1):84:84 -> <init>
@@ -11581,7 +11622,7 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.JdkBackedImmutableBiMap$InverseEntries.get(int):88 -> get
     3:3:java.lang.Object get(int):83 -> get
     1:1:int size():98:98 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMap -> com.android.tools.r8.internal.Yw:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMap -> com.android.tools.r8.internal.ex:
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> g
     java.util.Map delegateMap -> f
     1:3:void <init>(java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableList):53:55 -> <init>
@@ -11601,12 +11642,12 @@
     2:2:void forEach(java.util.function.BiConsumer):75 -> forEach
     3:3:void forEach(java.util.function.BiConsumer):76:76 -> forEach
     1:1:java.lang.Object get(java.lang.Object):65:65 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():70:70 -> k
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():81:81 -> l
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():86:86 -> m
-    boolean isPartialView() -> o
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():70:70 -> l
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():81:81 -> m
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():86:86 -> n
+    boolean isPartialView() -> p
     1:1:int size():60:60 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMultiset -> com.android.tools.r8.internal.Zw:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableMultiset -> com.android.tools.r8.internal.fx:
     com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet -> i
     long size -> h
     com.android.tools.r8.com.google.common.collect.ImmutableList entries -> g
@@ -11627,7 +11668,7 @@
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet():72:73 -> h
     3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):78:78 -> h
     1:1:int size():88:88 -> size
-com.android.tools.r8.com.google.common.collect.JdkBackedImmutableSet -> com.android.tools.r8.internal.ax:
+com.android.tools.r8.com.google.common.collect.JdkBackedImmutableSet -> com.android.tools.r8.internal.gx:
     java.util.Set delegate -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> f
     1:3:void <init>(java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList):33:35 -> <init>
@@ -11635,7 +11676,7 @@
     boolean isPartialView() -> e
     1:1:java.lang.Object get(int):40:40 -> get
     1:1:int size():55:55 -> size
-com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.HD:
+com.android.tools.r8.com.google.common.collect.LinkedHashMultiset -> com.android.tools.r8.internal.OD:
     1:1:void <init>():74:74 -> <init>
     2:2:void <init>(int):78:78 -> <init>
     1:2:int com.android.tools.r8.com.google.common.collect.Multisets.inferDistinctElements(java.lang.Iterable):378:379 -> a
@@ -11648,7 +11689,7 @@
     1:1:boolean isEmpty():41 -> isEmpty
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultiset.iterator():185:185 -> iterator
     1:1:java.util.Iterator iterator():41 -> iterator
-com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.WD:
+com.android.tools.r8.com.google.common.collect.Lists -> com.android.tools.r8.internal.dE:
     1:1:java.util.ArrayList newArrayList(java.lang.Object[]):103:103 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
     2:2:java.util.ArrayList newArrayList(java.lang.Object[]):103 -> a
@@ -11666,9 +11707,9 @@
     16:16:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.util.Iterator):143:143 -> a
     16:16:java.util.ArrayList newArrayList(java.lang.Iterable):130 -> a
     17:24:java.util.List reverse(java.util.List):796:803 -> a
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.TD:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.aE:
     1:1:void <init>(java.util.List):947:947 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.VD:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.cE:
     java.util.List forwardList -> b
     1:2:void <init>(java.util.List):810:811 -> <init>
     1:1:java.util.List getForwardList():815:815 -> a
@@ -11733,7 +11774,7 @@
     7:7:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.reversePosition(int):826:826 -> subList
     7:7:java.util.List subList(int,int):868 -> subList
     8:8:java.util.List subList(int,int):868:868 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.UD:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.bE:
     java.util.ListIterator val$forwardIterator -> c
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> d
     boolean canRemoveOrSet -> b
@@ -11758,7 +11799,7 @@
     1:2:void set(java.lang.Object):938:939 -> set
     3:3:void com.android.tools.r8.com.google.common.base.Preconditions.checkState(boolean):494:494 -> set
     3:3:void set(java.lang.Object):938 -> set
-com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.zF:
+com.android.tools.r8.com.google.common.collect.Maps -> com.android.tools.r8.internal.GF:
     1:1:java.util.HashMap newHashMap():226:226 -> a
     2:2:int capacity(int):268:268 -> a
     3:3:java.lang.Object safeGet(java.util.Map,java.lang.Object):3513:3513 -> a
@@ -11768,22 +11809,22 @@
     1:1:java.util.HashMap newHashMapWithExpectedSize(int):259:259 -> b
     2:2:java.util.IdentityHashMap newIdentityHashMap():431:431 -> b
     1:1:java.util.LinkedHashMap newLinkedHashMapWithExpectedSize(int):325:325 -> c
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.nF:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.uF:
     1:1:void <init>(java.util.Iterator):117:117 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):117:117 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$1.transform(java.util.Map$Entry):120:120 -> a
     2:2:java.lang.Object transform(java.lang.Object):117 -> a
-com.android.tools.r8.com.google.common.collect.Maps$2 -> com.android.tools.r8.internal.oF:
+com.android.tools.r8.com.google.common.collect.Maps$2 -> com.android.tools.r8.internal.vF:
     1:1:void <init>(java.util.Iterator):126:126 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):126:126 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$2.transform(java.util.Map$Entry):129:129 -> a
     2:2:java.lang.Object transform(java.lang.Object):126 -> a
-com.android.tools.r8.com.google.common.collect.Maps$7 -> com.android.tools.r8.internal.pF:
+com.android.tools.r8.com.google.common.collect.Maps$7 -> com.android.tools.r8.internal.wF:
     java.util.Map$Entry val$entry -> b
     1:1:void <init>(java.util.Map$Entry):1346:1346 -> <init>
     1:1:java.lang.Object getKey():1349:1349 -> getKey
     1:1:java.lang.Object getValue():1354:1354 -> getValue
-com.android.tools.r8.com.google.common.collect.Maps$8 -> com.android.tools.r8.internal.qF:
+com.android.tools.r8.com.google.common.collect.Maps$8 -> com.android.tools.r8.internal.xF:
     java.util.Iterator val$entryIterator -> b
     1:1:void <init>(java.util.Iterator):1361:1361 -> <init>
     1:1:boolean hasNext():1364:1364 -> hasNext
@@ -11799,22 +11840,22 @@
     4:4:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1346:1346 -> next
     4:4:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps$8.next():1369 -> next
     4:4:java.lang.Object next():1361 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.tF:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.AF:
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction VALUE -> b
     1:7:void <clinit>():92:98 -> <clinit>
     1:1:void <init>(java.lang.String,int):91:91 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.Maps$1):91:91 -> <init>
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.rF:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.yF:
     1:1:void <init>(java.lang.String,int):92:92 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):92:92 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1.apply(java.util.Map$Entry):95:95 -> apply
     2:2:java.lang.Object apply(java.lang.Object):92 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.sF:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.zF:
     1:1:void <init>(java.lang.String,int):98:98 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):98:98 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2.apply(java.util.Map$Entry):101:101 -> apply
     2:2:java.lang.Object apply(java.lang.Object):98 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.uF:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.BF:
     1:1:void <init>():3900:3900 -> <init>
     java.util.Map map() -> a
     1:1:void clear():3910:3910 -> clear
@@ -11832,21 +11873,21 @@
     2:2:boolean retainAll(java.util.Collection):3951 -> retainAll
     3:13:boolean retainAll(java.util.Collection):3951:3961 -> retainAll
     1:1:int size():3905:3905 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.wF:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.DF:
     1:1:void <init>():3462:3462 -> <init>
     1:1:void forEachEntry(java.util.function.Consumer):3499:3499 -> a
     1:1:java.util.Set entrySet():3475:3475 -> entrySet
-    java.util.Iterator entryIterator() -> g
-    1:1:java.util.Spliterator entrySpliterator():3470:3470 -> k
-    2:2:java.util.Spliterator entrySpliterator():3469:3469 -> k
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.vF:
+    java.util.Iterator entryIterator() -> h
+    1:1:java.util.Spliterator entrySpliterator():3470:3470 -> l
+    2:2:java.util.Spliterator entrySpliterator():3469:3469 -> l
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.CF:
     com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap):3475:3475 -> <init>
     1:1:java.util.Map map():3478:3478 -> a
     1:1:void forEach(java.util.function.Consumer):3493:3493 -> forEach
     1:1:java.util.Iterator iterator():3483:3483 -> iterator
     1:1:java.util.Spliterator spliterator():3488:3488 -> spliterator
-com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.xF:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.EF:
     java.util.Map map -> b
     1:2:void <init>(java.util.Map):3629:3630 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):3646:3646 -> a
@@ -11866,7 +11907,7 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3634:3634 -> size
     1:1:int size():3651 -> size
     2:2:int size():3651:3651 -> size
-com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.yF:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.FF:
     java.util.Map map -> b
     1:2:void <init>(java.util.Map):3814:3815 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):3831:3831 -> a
@@ -11922,12 +11963,12 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$Values.map():3819:3819 -> size
     1:1:int size():3881 -> size
     2:2:int size():3881:3881 -> size
-com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.PH:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.WH:
     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.Multimaps$Keys -> com.android.tools.r8.internal.SH:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.ZH:
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1664:1665 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.util.Map$Entry):1697:1697 -> a
@@ -11948,17 +11989,17 @@
     1:1:int size():1707:1707 -> size
     1:1:java.util.Spliterator spliterator():1691:1691 -> spliterator
     1:1:java.util.Set elementSet():1759:1759 -> x
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.RH:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.YH:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys,java.util.Iterator):1671:1671 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1671:1671 -> 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):1674:1674 -> a
     2:2:java.lang.Object transform(java.lang.Object):1671 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.QH:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.XH:
     java.util.Map$Entry val$backingEntry -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1674:1674 -> <init>
     1:1:int getCount():1682:1682 -> a
     1:1:java.lang.Object getElement():1677:1677 -> b
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.UH:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.bI:
     int add(java.lang.Object,int) -> a
     boolean setCount(java.lang.Object,int,int) -> a
     1:1:void forEachEntry(java.util.function.ObjIntConsumer):338:338 -> a
@@ -11976,10 +12017,10 @@
     int count(java.lang.Object) -> g
     1:1:java.util.Spliterator spliterator():473:473 -> spliterator
     java.util.Set elementSet() -> x
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.TH:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.aI:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.ZH:
+com.android.tools.r8.com.google.common.collect.Multisets -> com.android.tools.r8.internal.gI:
     1:13:boolean equalsImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.lang.Object):858:870 -> a
     14:14:boolean addAllImpl(com.android.tools.r8.com.google.common.collect.Multiset,java.util.Collection):881:881 -> a
     15:15:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
@@ -12002,26 +12043,26 @@
     42:42:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1131 -> a
     43:43: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
     43:43:com.android.tools.r8.com.google.common.collect.ImmutableMultiset copyHighestCountFirst(com.android.tools.r8.com.google.common.collect.Multiset):1131 -> a
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.VH:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.cI:
     1:1:void <init>():814:814 -> <init>
     1:4:boolean equals(java.lang.Object):821:824 -> equals
     1:2:int hashCode():835:836 -> hashCode
     1:3:java.lang.String toString():847:849 -> toString
-com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.WH:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.dI:
     com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount INSTANCE -> b
     1:1:void <clinit>():1135:1135 -> <clinit>
     1:1:void <init>():1134:1134 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1134:1134 -> 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):1139:1139 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1134 -> compare
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.XH:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.eI:
     java.lang.Object element -> b
     int count -> c
     1:4:void <init>(java.lang.Object,int):242:245 -> <init>
     1:1:int getCount():255:255 -> a
     1:1:java.lang.Object getElement():250:250 -> b
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> c
-com.android.tools.r8.com.google.common.collect.Multisets$MultisetIteratorImpl -> com.android.tools.r8.internal.YH:
+com.android.tools.r8.com.google.common.collect.Multisets$MultisetIteratorImpl -> com.android.tools.r8.internal.fI:
     java.util.Iterator entryIterator -> c
     com.android.tools.r8.com.google.common.collect.Multiset$Entry currentEntry -> d
     int totalCount -> f
@@ -12036,7 +12077,7 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):63:63 -> remove
     2:2:void remove():1085 -> remove
     3:9:void remove():1086:1092 -> remove
-com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.PL:
+com.android.tools.r8.com.google.common.collect.ObjectArrays -> com.android.tools.r8.internal.gM:
     1:1:java.lang.Object[] newArray(java.lang.Object[],int):59:59 -> a
     2:7:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Platform.newArray(java.lang.Object[],int):84:89 -> a
     2:7:java.lang.Object[] newArray(java.lang.Object[],int):59 -> a
@@ -12046,9 +12087,9 @@
     10:10:java.lang.Object com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementNotNull(java.lang.Object,int):225:225 -> a
     10:10:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):215 -> a
     10:10:java.lang.Object[] checkElementsNotNull(java.lang.Object[]):209 -> a
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.ZM:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.qN:
     1:1:void <init>():391:391 -> <init>
-com.android.tools.r8.com.google.common.collect.Platform -> com.android.tools.r8.internal.XN:
+com.android.tools.r8.com.google.common.collect.Platform -> com.android.tools.r8.internal.pO:
 # {"id":"sourceFile","fileName":"Platform.java"}
     int $r8$clinit -> a
     1:1:void <clinit>():33:33 -> <clinit>
@@ -12056,7 +12097,7 @@
     2:2:java.lang.Object[] copy(java.lang.Object[],int,int,java.lang.Object[]):95:95 -> a
     1:1:java.util.LinkedHashMap com.android.tools.r8.com.google.common.collect.Maps.newLinkedHashMap():292:292 -> b
     1:1:java.util.Map preservesInsertionOrderOnPutsMap():66 -> b
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.yU:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.TU:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> e
     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>
@@ -12070,7 +12111,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():46:46 -> j
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.RegularImmutableAsList.listIterator(int):56:56 -> listIterator
     1:1:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.CU:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.XU:
     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
@@ -12135,17 +12176,17 @@
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.RegularImmutableMap.get(java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[],int):165:165 -> get
     7:7:java.lang.Object get(java.lang.Object):138 -> get
     1:1:int hashCode():168:168 -> hashCode
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():143:144 -> k
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():75:75 -> k
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():144 -> k
-    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145:145 -> k
-    5:5:void com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet.<init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):40:40 -> k
-    5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145 -> k
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():150:150 -> l
-    boolean isPartialView() -> o
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():143:144 -> l
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():75:75 -> l
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():144 -> l
+    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145:145 -> l
+    5:5:void com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet.<init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):40:40 -> l
+    5:5:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145 -> l
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():150:150 -> m
+    boolean isPartialView() -> p
     1:1:int size():178:178 -> size
-    1:5:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():185:189 -> u
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.BU:
+    1:5:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():185:189 -> v
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.WU:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap this$0 -> f
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):192:192 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap,com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1):192:192 -> <init>
@@ -12161,11 +12202,11 @@
     8:8:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableEntry.getKey():36:36 -> get
     8:8:java.lang.Object get(java.lang.Object):220 -> get
     9:9:java.lang.Object get(java.lang.Object):218:218 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse.inverse():201:201 -> h
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():192 -> h
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():233:233 -> k
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():228:228 -> l
-    boolean isPartialView() -> o
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse.inverse():201:201 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():192 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():233:233 -> l
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():228:228 -> m
+    boolean isPartialView() -> p
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse.inverse():201:201 -> size
     1:1:int size():196 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.size():178:178 -> size
@@ -12173,8 +12214,8 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.size():178:178 -> size
     3:3:int size():196 -> size
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():201:201 -> u
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.AU:
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():201:201 -> v
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.VU:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):236:236 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():254:254 -> f
@@ -12185,7 +12226,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet.iterator():254:254 -> iterator
     1:1:java.util.Iterator iterator():236 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():239:239 -> k
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.zU:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.UU:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):264:264 -> <init>
     1:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):267:268 -> get
@@ -12194,7 +12235,7 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):268 -> get
     3:3:java.lang.Object get(int):264 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():273:273 -> j
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.DU:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.YU:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> e
     1:1:void <clinit>():32:32 -> <clinit>
@@ -12216,7 +12257,7 @@
     1:1:java.util.ListIterator listIterator(int):29:29 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():88:88 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.GU:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.bV:
     com.android.tools.r8.com.google.common.collect.ImmutableMap EMPTY -> i
     java.util.Map$Entry[] entries -> f
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> g
@@ -12261,14 +12302,14 @@
     6:6:java.lang.Object get(java.lang.Object):154 -> get
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.RegularImmutableMap.get(java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[],int):165:165 -> get
     7:7:java.lang.Object get(java.lang.Object):154 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():201:201 -> k
-    2:2:void com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet.<init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):40:40 -> k
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():201 -> k
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():206:206 -> l
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():257:257 -> m
-    boolean isPartialView() -> o
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():201:201 -> l
+    2:2:void com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet.<init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):40:40 -> l
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():201 -> l
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():206:206 -> m
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():257:257 -> n
+    boolean isPartialView() -> p
     1:1:int size():191:191 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.EU:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.ZU:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):213:214 -> <init>
     1:1:boolean contains(java.lang.Object):224:224 -> contains
@@ -12280,7 +12321,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int com.android.tools.r8.com.google.common.collect.RegularImmutableMap.size():191:191 -> size
     3:3:int size():234 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.FU:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.aV:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):264:265 -> <init>
     boolean isPartialView() -> e
@@ -12291,7 +12332,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:int com.android.tools.r8.com.google.common.collect.RegularImmutableMap.size():191:191 -> size
     3:3:int size():275 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.IU:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.dV:
     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
@@ -12321,11 +12362,11 @@
     3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):188:188 -> h
     1:1:int hashCode():193:193 -> hashCode
     1:1:int size():177:177 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.HU:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.cV:
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> d
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):142:143 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():148:148 -> c
-com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.JU:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.eV:
     java.lang.Object[] elements -> e
     int hashCode -> h
     com.android.tools.r8.com.google.common.collect.RegularImmutableSet EMPTY -> i
@@ -12352,7 +12393,7 @@
     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.Sets -> com.android.tools.r8.internal.NW:
+com.android.tools.r8.com.google.common.collect.Sets -> com.android.tools.r8.internal.iX:
     1:3:java.util.HashSet newHashSet(java.lang.Iterable):219:221 -> a
     4:4:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():178:178 -> a
     4:4:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.util.Iterator):237 -> a
@@ -12395,7 +12436,7 @@
     1:1:java.util.Set newIdentityHashSet():423 -> c
     2:2:java.util.Set newIdentityHashSet():423:423 -> c
     1:1:java.util.LinkedHashSet newLinkedHashSet():305:305 -> d
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.EW:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.ZW:
     java.util.Set val$set2 -> c
     java.util.Set val$set1 -> b
     1:1:void <init>(java.util.Set,java.util.Set):791:791 -> <init>
@@ -12407,12 +12448,12 @@
     1:1:java.util.stream.Stream parallelStream():817:817 -> parallelStream
     1:2:int size():823:824 -> size
     1:1:java.util.stream.Stream stream():812:812 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.DW:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.YW:
     java.util.Iterator itr -> d
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):794:795 -> <init>
     1:7:java.lang.Object computeNext():799:805 -> j
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.GW:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.bX:
     java.util.Set val$set2 -> c
     java.util.Set val$set1 -> b
     1:1:void <init>(java.util.Set,java.util.Set):862:862 -> <init>
@@ -12425,12 +12466,12 @@
     1:1:java.util.stream.Stream parallelStream():888:888 -> parallelStream
     1:2:int size():894:895 -> size
     1:1:java.util.stream.Stream stream():883:883 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.FW:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.aX:
     java.util.Iterator itr -> d
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):865:866 -> <init>
     1:7:java.lang.Object computeNext():870:876 -> j
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.KW:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.fX:
     com.android.tools.r8.com.google.common.collect.ImmutableMap val$index -> c
     int val$size -> b
     1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMap):1618:1618 -> <init>
@@ -12438,32 +12479,32 @@
     1:1:java.util.Iterator iterator():1630:1630 -> iterator
     1:1:int size():1697:1697 -> size
     1:1:java.lang.String toString():1702:1702 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.JW:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.eX:
     java.util.BitSet bits -> d
     com.android.tools.r8.com.google.common.collect.Sets$5 this$0 -> e
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5):1630:1631 -> <init>
     1:29:java.util.Set com.android.tools.r8.com.google.common.collect.Sets$5$1.computeNext():1635:1663 -> j
     1:29:java.lang.Object computeNext():1630 -> j
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.IW:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.dX:
     com.android.tools.r8.com.google.common.collect.Sets$5$1 this$1 -> c
     java.util.BitSet val$copy -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1,java.util.BitSet):1663:1663 -> <init>
     1:2:boolean contains(java.lang.Object):1666:1667 -> contains
     1:1:java.util.Iterator iterator():1672:1672 -> iterator
     1:1:int size():1688:1688 -> size
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.HW:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.cX:
     com.android.tools.r8.com.google.common.collect.Sets$5$1$1 this$2 -> e
     int i -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1$1):1672:1673 -> <init>
     1:5:java.lang.Object computeNext():1677:1681 -> j
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.LW:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.gX:
     1:1:void <init>():76:76 -> <init>
     1:1:boolean removeAll(java.util.Collection):79:79 -> removeAll
     1:1:boolean retainAll(java.util.Collection):84:84 -> retainAll
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> retainAll
     2:2:boolean retainAll(java.util.Collection):84 -> retainAll
     3:3:boolean retainAll(java.util.Collection):84:84 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.MW:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.hX:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):549:549 -> <init>
     2:2:void <init>():550:550 -> <init>
     1:1:boolean add(java.lang.Object):589:589 -> add
@@ -12473,7 +12514,7 @@
     1:1:boolean removeAll(java.util.Collection):628:628 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):641:641 -> removeIf
     1:1:boolean retainAll(java.util.Collection):654:654 -> retainAll
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.EX:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.ZX:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap lazyInverse -> i
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> h
     java.lang.Object singleKey -> f
@@ -12487,18 +12528,18 @@
     2:2:void forEach(java.util.function.BiConsumer):66 -> forEach
     3:3:void forEach(java.util.function.BiConsumer):66:66 -> forEach
     1:1:java.lang.Object get(java.lang.Object):56:56 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():86:86 -> k
-    2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1320:1320 -> k
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():86 -> k
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():86:86 -> k
-    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):84:84 -> k
-    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():86 -> k
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():91:91 -> l
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):84:84 -> l
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():91 -> l
-    boolean isPartialView() -> o
-    1:7:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():99:105 -> u
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.FX:
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():86:86 -> l
+    2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1320:1320 -> l
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():86 -> l
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():86:86 -> l
+    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):84:84 -> l
+    4:4:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():86 -> l
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():91:91 -> m
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):84:84 -> m
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():91 -> m
+    boolean isPartialView() -> p
+    1:7:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():99:105 -> v
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.aY:
     java.lang.Object element -> d
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> e
@@ -12513,7 +12554,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.GX:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.bY:
     java.lang.Object element -> e
     int cachedHashCode -> f
     1:2:void <init>(java.lang.Object):43:44 -> <init>
@@ -12529,7 +12570,7 @@
     1:3:int hashCode():87:89 -> hashCode
     1:1:boolean isHashCodeFast():96:96 -> i
     1:1:java.lang.String toString():101:101 -> toString
-com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.hZ:
+com.android.tools.r8.com.google.common.collect.Streams -> com.android.tools.r8.internal.CZ:
     java.util.Spliterator lambda$concat$0(java.util.Spliterator) -> a
     1:3:java.util.stream.Stream stream(java.lang.Iterable):62:64 -> a
     4:15:java.util.stream.Stream concat(java.util.stream.Stream[]):162:173 -> a
@@ -12553,27 +12594,27 @@
     68:116:java.util.stream.Stream mapWithIndex(java.util.stream.Stream,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):423:471 -> a
     1:3:void com.android.tools.r8.com.google.common.collect.Streams.closeAll(java.util.stream.BaseStream[]):141:143 -> b
     1:3:void lambda$concat$1(java.util.stream.Stream[]):178 -> b
-com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.cZ:
+com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.xZ:
     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):319:319 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):322:323 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.dZ:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.yZ:
     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):444:445 -> <init>
     1:1:void accept(java.lang.Object):450:450 -> accept
     1:7:boolean tryAdvance(java.util.function.Consumer):455:461 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.eZ:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.zZ:
     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):426:427 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):431:432 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.fZ:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.AZ:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.gZ:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.BZ:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):732:734 -> <init>
@@ -12587,17 +12628,17 @@
     6:6:java.util.Spliterator trySplit():726 -> trySplit
     7:7:com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.trySplit():747:747 -> trySplit
     7:7:java.util.Spliterator trySplit():726 -> trySplit
-com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.z10:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.V10:
     java.util.Iterator backingIterator -> b
     1:2:void <init>(java.util.Iterator):34:35 -> <init>
     java.lang.Object transform(java.lang.Object) -> a
     1:1:boolean hasNext():42:42 -> hasNext
     1:1:java.lang.Object next():47:47 -> next
     1:1:void remove():52:52 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.C30:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.Y30:
     1:1:void <init>():36:36 -> <init>
     1:1:void remove():48:48 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.D30:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.Z30:
     1:1:void <init>():33:33 -> <init>
     1:1:void add(java.lang.Object):45:45 -> add
     1:1:void set(java.lang.Object):58:58 -> set
@@ -12652,7 +12693,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.pn:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.un:
     char[] hexDigits -> b
     int $r8$clinit -> c
     1:1:void <clinit>():420:420 -> <clinit>
@@ -12681,7 +12722,7 @@
     2:2:byte[] com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode.getBytesInternal():304:304 -> toString
     2:2:java.lang.String toString():412 -> toString
     3:7:java.lang.String toString():413:417 -> toString
-com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.on:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.tn:
     byte[] bytes -> d
     1:2:void <init>(byte[]):253:254 -> <init>
     1:1:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):311:311 -> a
@@ -12692,10 +12733,10 @@
     10:10:byte[] com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode.getBytesInternal():304:304 -> a
     10:10:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):317 -> a
     11:11:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):317:317 -> a
-com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.tn:
+com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.yn:
     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.vn:
+com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.An:
     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
@@ -12705,16 +12746,16 @@
     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.zn:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.En:
 # {"id":"sourceFile","fileName":"Hashing.java"}
     int GOOD_FAST_HASH_SEED -> a
     1:1:void <clinit>():91:91 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction murmur3_128():134:134 -> a
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction sha256():201:201 -> b
-com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.yn:
+com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.Dn:
     com.android.tools.r8.com.google.common.hash.HashFunction SHA_256 -> a
     1:1:void <clinit>():205:205 -> <clinit>
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.ZF:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.gG:
     java.security.MessageDigest prototype -> b
     int bytes -> c
     java.lang.String toString -> e
@@ -12724,7 +12765,7 @@
     2:4:java.security.MessageDigest getMessageDigest(java.lang.String):82:84 -> a
     5:12:com.android.tools.r8.com.google.common.hash.Hasher newHasher():90:97 -> a
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.YF:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.fG:
     java.security.MessageDigest digest -> b
     int bytes -> c
     boolean done -> d
@@ -12744,7 +12785,7 @@
     3:3:void com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher.checkNotDone():152:152 -> b
     3:3:void update(byte[],int,int):141 -> b
     4:4:void update(byte[],int,int):142:142 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.bI:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction -> com.android.tools.r8.internal.iI:
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_128 -> c
     int seed -> b
     1:3:void <clinit>():45:47 -> <clinit>
@@ -12753,7 +12794,7 @@
     1:3:boolean equals(java.lang.Object):74:76 -> equals
     1:1:int hashCode():83:83 -> hashCode
     1:1:java.lang.String toString():69:69 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.aI:
+com.android.tools.r8.com.google.common.hash.Murmur3_128HashFunction$Murmur3_128Hasher -> com.android.tools.r8.internal.hI:
     long h2 -> e
     int length -> f
     long h1 -> d
@@ -12971,7 +13012,7 @@
     185:185:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():187 -> a
     185:185:com.android.tools.r8.com.google.common.hash.HashCode com.android.tools.r8.com.google.common.hash.AbstractStreamingHasher.hash():0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.A4:
+com.android.tools.r8.com.google.common.io.BaseEncoding -> com.android.tools.r8.internal.C4:
     com.android.tools.r8.com.google.common.io.BaseEncoding BASE64_URL -> a
     1:45:void <clinit>():320:364 -> <clinit>
     46:46:void com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding.<init>(java.lang.String,java.lang.String,java.lang.Character):571:571 -> <clinit>
@@ -12994,7 +13035,7 @@
     12:12:java.lang.String encode(byte[]):148 -> a
     13:13:com.android.tools.r8.com.google.common.io.BaseEncoding base64Url():360:360 -> 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.w4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet -> com.android.tools.r8.internal.y4:
     char[] chars -> b
     int bytesPerChunk -> f
     byte[] decodabet -> g
@@ -13011,19 +13052,19 @@
     1:3:boolean equals(java.lang.Object):551:553 -> equals
     1:1:int hashCode():560:560 -> hashCode
     1:1:java.lang.String toString():546:546 -> toString
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.x4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base16Encoding -> com.android.tools.r8.internal.z4:
     char[] encoding -> d
     1:1:void <init>(java.lang.String,java.lang.String):893:893 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):897:897 -> <init>
     3:14:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet):890:901 -> <init>
     1:6:void encodeTo(java.lang.Appendable,byte[],int,int):907:912 -> a
     7:7:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):932:932 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.y4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$Base64Encoding -> com.android.tools.r8.internal.A4:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.Character):938:938 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):942:943 -> <init>
     1:12:void encodeTo(java.lang.Appendable,byte[],int,int):948:959 -> a
     13:13:com.android.tools.r8.com.google.common.io.BaseEncoding newInstance(com.android.tools.r8.com.google.common.io.BaseEncoding$Alphabet,java.lang.Character):989:989 -> a
-com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.z4:
+com.android.tools.r8.com.google.common.io.BaseEncoding$StandardBaseEncoding -> com.android.tools.r8.internal.B4:
     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):574:577 -> <init>
@@ -13038,7 +13079,7 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):77:77 -> hashCode
     2:2:int hashCode():885 -> hashCode
     1:10:java.lang.String toString():861:870 -> toString
-com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.q6:
+com.android.tools.r8.com.google.common.io.ByteStreams -> com.android.tools.r8.internal.s6:
     int $r8$clinit -> a
     1:1:void <clinit>():640:640 -> <clinit>
     1:1:byte[] toByteArray(java.io.InputStream):220:220 -> a
@@ -13060,7 +13101,7 @@
     19:25:byte[] toByteArray(java.io.InputStream):221 -> a
     26:26:byte[] com.android.tools.r8.com.google.common.io.ByteStreams.toByteArrayInternal(java.io.InputStream,java.util.Queue,int):195:195 -> a
     26:26:byte[] toByteArray(java.io.InputStream):221 -> a
-com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.p6:
+com.android.tools.r8.com.google.common.io.ByteStreams$1 -> com.android.tools.r8.internal.r6:
     1:1:void <init>():641:641 -> <init>
     1:1:java.lang.String toString():660:660 -> toString
     1:1:void write(byte[]):649:649 -> write
@@ -13069,7 +13110,7 @@
     3:3:void write(byte[],int,int):655:655 -> write
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> write
     4:4:void write(byte[],int,int):655 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.x9:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.A9:
     java.lang.CharSequence seq -> b
     int mark -> d
     int pos -> c
@@ -13110,11 +13151,11 @@
     4:5:long skip(long):97:98 -> skip
     6:6:void com.android.tools.r8.com.google.common.base.Preconditions.checkArgument(boolean,java.lang.String,long):205:205 -> skip
     6:6:long skip(long):95 -> skip
-com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.A9:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.D9:
     1:1:void <init>():75:75 -> <init>
     java.io.Reader openStream() -> a
     1:3:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):480:482 -> a
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.y9:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.B9:
     java.lang.CharSequence seq -> a
     1:1:void <clinit>():524:524 -> <clinit>
     1:2:void <init>(java.lang.CharSequence):528:529 -> <init>
@@ -13128,20 +13169,20 @@
     4:16:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):563:575 -> toString
     4:16:java.lang.String toString():608 -> toString
     17:17:java.lang.String toString():608:608 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.z9:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.C9:
     1:1:void <init>(java.lang.String):629:629 -> <init>
     1:1:java.io.Reader openStream():634:634 -> a
-com.android.tools.r8.com.google.common.io.CharStreams -> com.android.tools.r8.internal.B9:
+com.android.tools.r8.com.google.common.io.CharStreams -> com.android.tools.r8.internal.E9:
     1:1:java.lang.StringBuilder com.android.tools.r8.com.google.common.io.CharStreams.toStringBuilder(java.lang.Readable):176:176 -> a
     1:1:java.lang.String toString(java.lang.Readable):164 -> a
     2:8:long com.android.tools.r8.com.google.common.io.CharStreams.copyReaderToBuilder(java.io.Reader,java.lang.StringBuilder):115:121 -> a
     2:8:java.lang.StringBuilder com.android.tools.r8.com.google.common.io.CharStreams.toStringBuilder(java.lang.Readable):178 -> a
     2:8:java.lang.String toString(java.lang.Readable):164 -> a
     9:9:java.lang.String toString(java.lang.Readable):164:164 -> a
-com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.Jb:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.Mb:
     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.Nb:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.Qb:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> b
     java.util.Deque stack -> c
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> d
@@ -13174,12 +13215,12 @@
     25:25:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfInstanceOf(java.lang.Throwable,java.lang.Class):104 -> close
     25:25:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfPossible(java.lang.Throwable,java.lang.Class):184 -> close
     25:25:void close():224 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.Kb:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.Nb:
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
     1:1:void <clinit>():244:244 -> <clinit>
     1:1:void <init>():242:242 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):249:249 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.Lb:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.Ob:
     com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():261:261 -> <clinit>
@@ -13190,9 +13231,9 @@
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):284:284 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):249:249 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):287 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.Mb:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.Pb:
     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.Nu:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.Tu:
     int[] biggestBinomials -> a
     1:1:void <clinit>():676:676 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -13224,28 +13265,28 @@
     31:31:int checkedAdd(int,int):456:456 -> b
     32:32:void com.android.tools.r8.com.google.common.math.MathPreconditions.checkNoOverflow(boolean,java.lang.String,int,int):95:95 -> b
     32:32:int checkedAdd(int,int):456 -> b
-com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.Mu:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.Su:
     int[] $SwitchMap$java$math$RoundingMode -> a
     1:1:void <clinit>():120:120 -> <clinit>
-com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.GF:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.NF:
     1:1:int checkNonNegative(java.lang.String,int):54:54 -> a
-com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.Sv:
+com.android.tools.r8.com.google.common.primitives.Ints -> com.android.tools.r8.internal.Yv:
     int fromBytes(byte,byte,byte,byte) -> a
     int saturatedCast(long) -> a
-com.android.tools.r8.com.google.gson.ExclusionStrategy -> com.android.tools.r8.internal.Vj:
+com.android.tools.r8.com.google.gson.ExclusionStrategy -> com.android.tools.r8.internal.ak:
     boolean shouldSkipClass(java.lang.Class) -> a
     boolean shouldSkipField(com.android.tools.r8.com.google.gson.FieldAttributes) -> b
-com.android.tools.r8.com.google.gson.FieldNamingPolicy -> com.android.tools.r8.internal.Bk:
+com.android.tools.r8.com.google.gson.FieldNamingPolicy -> com.android.tools.r8.internal.Gk:
     com.android.tools.r8.com.google.gson.FieldNamingPolicy IDENTITY -> b
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(java.lang.String,int):31:31 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.gson.FieldNamingPolicy$1):31:31 -> <init>
-com.android.tools.r8.com.google.gson.FieldNamingPolicy$1 -> com.android.tools.r8.internal.Ak:
+com.android.tools.r8.com.google.gson.FieldNamingPolicy$1 -> com.android.tools.r8.internal.Fk:
     1:1:void <init>(java.lang.String,int):37:37 -> <init>
     1:1:java.lang.String translateName(java.lang.reflect.Field):39:39 -> a
-com.android.tools.r8.com.google.gson.FieldNamingStrategy -> com.android.tools.r8.internal.Ck:
+com.android.tools.r8.com.google.gson.FieldNamingStrategy -> com.android.tools.r8.internal.Hk:
     java.lang.String translateName(java.lang.reflect.Field) -> a
-com.android.tools.r8.com.google.gson.Gson -> com.android.tools.r8.internal.Ym:
+com.android.tools.r8.com.google.gson.Gson -> com.android.tools.r8.internal.dn:
     java.util.Map typeTokenCache -> b
     java.lang.ThreadLocal calls -> a
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> d
@@ -13277,9 +13318,9 @@
     3:3:com.android.tools.r8.com.google.gson.TypeAdapter atomicLongArrayAdapter(com.android.tools.r8.com.google.gson.TypeAdapter):388 -> b
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter longAdapter(com.android.tools.r8.com.google.gson.LongSerializationPolicy):332:332 -> c
     1:6:java.lang.String toString():982:987 -> toString
-com.android.tools.r8.com.google.gson.Gson$1 -> com.android.tools.r8.internal.Sm:
+com.android.tools.r8.com.google.gson.Gson$1 -> com.android.tools.r8.internal.Xm:
     1:1:void <init>():112:112 -> <init>
-com.android.tools.r8.com.google.gson.Gson$2 -> com.android.tools.r8.internal.Tm:
+com.android.tools.r8.com.google.gson.Gson$2 -> com.android.tools.r8.internal.Ym:
     1:1:void <init>(com.android.tools.r8.com.google.gson.Gson):278:278 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):278:278 -> a
     2:5:void com.android.tools.r8.com.google.gson.Gson$2.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):288:291 -> a
@@ -13294,7 +13335,7 @@
     8:8:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):278 -> a
     9:13:java.lang.Double com.android.tools.r8.com.google.gson.Gson$2.read(com.android.tools.r8.com.google.gson.stream.JsonReader):280:284 -> a
     9:13:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):278 -> a
-com.android.tools.r8.com.google.gson.Gson$3 -> com.android.tools.r8.internal.Um:
+com.android.tools.r8.com.google.gson.Gson$3 -> com.android.tools.r8.internal.Zm:
     1:1:void <init>(com.android.tools.r8.com.google.gson.Gson):302:302 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):302:302 -> a
     2:5:void com.android.tools.r8.com.google.gson.Gson$3.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):312:315 -> a
@@ -13309,7 +13350,7 @@
     8:8:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):302 -> a
     9:13:java.lang.Float com.android.tools.r8.com.google.gson.Gson$3.read(com.android.tools.r8.com.google.gson.stream.JsonReader):304:308 -> a
     9:13:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):302 -> a
-com.android.tools.r8.com.google.gson.Gson$5 -> com.android.tools.r8.internal.Vm:
+com.android.tools.r8.com.google.gson.Gson$5 -> com.android.tools.r8.internal.an:
     com.android.tools.r8.com.google.gson.TypeAdapter val$longAdapter -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):353:353 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):353:353 -> a
@@ -13317,7 +13358,7 @@
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):353 -> a
     3:4:java.util.concurrent.atomic.AtomicLong com.android.tools.r8.com.google.gson.Gson$5.read(com.android.tools.r8.com.google.gson.stream.JsonReader):358:359 -> a
     3:4:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):353 -> a
-com.android.tools.r8.com.google.gson.Gson$6 -> com.android.tools.r8.internal.Wm:
+com.android.tools.r8.com.google.gson.Gson$6 -> com.android.tools.r8.internal.bn:
     com.android.tools.r8.com.google.gson.TypeAdapter val$longAdapter -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):365:365 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):365:365 -> a
@@ -13325,7 +13366,7 @@
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):365 -> a
     7:17:java.util.concurrent.atomic.AtomicLongArray com.android.tools.r8.com.google.gson.Gson$6.read(com.android.tools.r8.com.google.gson.stream.JsonReader):374:384 -> a
     7:17:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):365 -> a
-com.android.tools.r8.com.google.gson.Gson$FutureTypeAdapter -> com.android.tools.r8.internal.Xm:
+com.android.tools.r8.com.google.gson.Gson$FutureTypeAdapter -> com.android.tools.r8.internal.cn:
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> a
     1:1:void <init>():955:955 -> <init>
     1:4:void setDelegate(com.android.tools.r8.com.google.gson.TypeAdapter):959:962 -> a
@@ -13334,9 +13375,9 @@
     10:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):967:967 -> a
     11:14:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):973:976 -> a
     15:15:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):974:974 -> a
-com.android.tools.r8.com.google.gson.InstanceCreator -> com.android.tools.r8.internal.Kq:
+com.android.tools.r8.com.google.gson.InstanceCreator -> com.android.tools.r8.internal.Pq:
     java.lang.Object createInstance(java.lang.reflect.Type) -> a
-com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.gx:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.mx:
     java.util.List elements -> b
     1:2:void <init>():39:40 -> <init>
     1:1:void add(java.lang.String):85:85 -> a
@@ -13350,7 +13391,7 @@
     1:1:int hashCode():371:371 -> hashCode
     1:1:java.util.Iterator iterator():171:171 -> iterator
     1:1:int size():161:161 -> size
-com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.hx:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.nx:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> a
     1:1:int getAsInt():243:243 -> b
@@ -13366,16 +13407,16 @@
     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.ix:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.ox:
     1:1:void <init>(java.lang.String):29:29 -> <init>
     2:2:void <init>(java.lang.Throwable):43:43 -> <init>
-com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.jx:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.px:
     com.android.tools.r8.com.google.gson.JsonNull INSTANCE -> b
     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.kx:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.qx:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap members -> b
     1:2:void <init>():32:33 -> <init>
     1:1:void addProperty(java.lang.String,java.lang.Boolean):0:0 -> a
@@ -13399,11 +13440,11 @@
     1:2:boolean equals(java.lang.Object):196:197 -> equals
     1:1:com.android.tools.r8.com.google.gson.JsonObject getAsJsonObject(java.lang.String):191:191 -> g
     1:1:int hashCode():202:202 -> hashCode
-com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.lx:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.rx:
     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.mx:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.sx:
     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
@@ -13431,7 +13472,7 @@
     43:43:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):84 -> a
     44:44:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):88:88 -> a
     45:49: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.nx:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.tx:
     java.lang.Class[] PRIMITIVE_TYPES -> c
     java.lang.Object value -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -13469,24 +13510,24 @@
     1:13:int hashCode():289:301 -> hashCode
     1:1:boolean isNumber():146:146 -> i
     1:1:boolean isString():166:166 -> j
-com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.rx:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.xx:
     1:1:void <init>(java.lang.String):30:30 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):34:34 -> <init>
     3:3:void <init>(java.lang.Throwable):45:45 -> <init>
-com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.U10:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.q20:
     1:1:void <init>():119:119 -> <init>
     java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader) -> a
     void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter nullSafe():186:186 -> a
-com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.T10:
+com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.p20:
     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.TypeAdapterFactory -> com.android.tools.r8.internal.V10:
+com.android.tools.r8.com.google.gson.TypeAdapterFactory -> com.android.tools.r8.internal.r20:
     com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken) -> a
-com.android.tools.r8.com.google.gson.annotations.JsonAdapter -> com.android.tools.r8.internal.ex:
-com.android.tools.r8.com.google.gson.annotations.SerializedName -> com.android.tools.r8.internal.zW:
+com.android.tools.r8.com.google.gson.annotations.JsonAdapter -> com.android.tools.r8.internal.kx:
+com.android.tools.r8.com.google.gson.annotations.SerializedName -> com.android.tools.r8.internal.UW:
 com.android.tools.r8.com.google.gson.internal.$Gson$Preconditions -> com.android.tools.r8.internal.a:
 # {"id":"sourceFile","fileName":"$Gson$Preconditions.java"}
     1:1:java.lang.Object checkNotNull(java.lang.Object):39:39 -> a
@@ -13589,7 +13630,7 @@
     1173:1173:java.lang.String toString():582:582 -> toString
     1174:1174:java.lang.String toString():582:582 -> toString
     1165:1165:java.lang.String toString():582:582 -> toString
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor -> com.android.tools.r8.internal.pe:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor -> com.android.tools.r8.internal.se:
     java.util.Map instanceCreators -> a
     1:2:void <init>(java.util.Map):51:52 -> <init>
     1:21:com.android.tools.r8.com.google.gson.internal.ObjectConstructor get(com.android.tools.r8.com.google.gson.reflect.TypeToken):56:76 -> a
@@ -13602,22 +13643,22 @@
     101:101:com.android.tools.r8.com.google.gson.internal.ObjectConstructor com.android.tools.r8.com.google.gson.internal.ConstructorConstructor.newUnsafeAllocator(java.lang.reflect.Type,java.lang.Class):218:218 -> a
     101:101:com.android.tools.r8.com.google.gson.internal.ObjectConstructor get(com.android.tools.r8.com.google.gson.reflect.TypeToken):94 -> a
     1:1:java.lang.String toString():234:234 -> toString
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$1 -> com.android.tools.r8.internal.ge:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$1 -> com.android.tools.r8.internal.je:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.InstanceCreator,java.lang.reflect.Type):64:64 -> <init>
     1:1:java.lang.Object construct():66:66 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$10 -> com.android.tools.r8.internal.be:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$10 -> com.android.tools.r8.internal.ee:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):186:186 -> <init>
     1:1:java.lang.Object construct():188:188 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$11 -> com.android.tools.r8.internal.ce:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$11 -> com.android.tools.r8.internal.fe:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):192:192 -> <init>
     1:1:java.lang.Object construct():194:194 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$12 -> com.android.tools.r8.internal.de:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$12 -> com.android.tools.r8.internal.ge:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):199:199 -> <init>
     1:1:java.lang.Object construct():201:201 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$13 -> com.android.tools.r8.internal.ee:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$13 -> com.android.tools.r8.internal.he:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):205:205 -> <init>
     1:1:java.lang.Object construct():207:207 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$14 -> com.android.tools.r8.internal.fe:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$14 -> com.android.tools.r8.internal.ie:
     com.android.tools.r8.com.google.gson.internal.UnsafeAllocator unsafeAllocator -> a
     java.lang.reflect.Type val$type -> c
     java.lang.Class val$rawType -> b
@@ -13629,10 +13670,10 @@
     233:233:java.lang.Object construct():226:226 -> a
     234:234:java.lang.Object construct():226:226 -> a
     231:231:java.lang.Object construct():226:226 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$2 -> com.android.tools.r8.internal.he:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$2 -> com.android.tools.r8.internal.ke:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.InstanceCreator,java.lang.reflect.Type):76:76 -> <init>
     1:1:java.lang.Object construct():78:78 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$3 -> com.android.tools.r8.internal.ie:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$3 -> com.android.tools.r8.internal.le:
     java.lang.reflect.Constructor val$constructor -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,java.lang.reflect.Constructor):103:103 -> <init>
     1:11:java.lang.Object construct():108:118 -> a
@@ -13650,10 +13691,10 @@
     250:250:java.lang.Object construct():111:111 -> a
     251:251:java.lang.Object construct():111:111 -> a
     242:242:java.lang.Object construct():111:111 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$4 -> com.android.tools.r8.internal.je:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$4 -> com.android.tools.r8.internal.me:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):136:136 -> <init>
     1:1:java.lang.Object construct():138:138 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$5 -> com.android.tools.r8.internal.ke:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$5 -> com.android.tools.r8.internal.ne:
     java.lang.reflect.Type val$type -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,java.lang.reflect.Type):142:142 -> <init>
     1:6:java.lang.Object construct():145:150 -> a
@@ -13669,19 +13710,19 @@
     321:321:java.lang.Object construct():153:153 -> a
     322:322:java.lang.Object construct():153:153 -> a
     314:314:java.lang.Object construct():153:153 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$6 -> com.android.tools.r8.internal.le:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$6 -> com.android.tools.r8.internal.oe:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):158:158 -> <init>
     1:1:java.lang.Object construct():160:160 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$7 -> com.android.tools.r8.internal.me:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$7 -> com.android.tools.r8.internal.pe:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):164:164 -> <init>
     1:1:java.lang.Object construct():166:166 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$8 -> com.android.tools.r8.internal.ne:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$8 -> com.android.tools.r8.internal.qe:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):170:170 -> <init>
     1:1:java.lang.Object construct():172:172 -> a
-com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$9 -> com.android.tools.r8.internal.oe:
+com.android.tools.r8.com.google.gson.internal.ConstructorConstructor$9 -> com.android.tools.r8.internal.re:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):180:180 -> <init>
     1:1:java.lang.Object construct():182:182 -> a
-com.android.tools.r8.com.google.gson.internal.Excluder -> com.android.tools.r8.internal.Uj:
+com.android.tools.r8.com.google.gson.internal.Excluder -> com.android.tools.r8.internal.Zj:
     java.util.List serializationStrategies -> b
     java.util.List deserializationStrategies -> c
     com.android.tools.r8.com.google.gson.internal.Excluder DEFAULT -> d
@@ -13700,7 +13741,7 @@
     44:46:boolean excludeClass(java.lang.Class,boolean):205:207 -> a
     1:3:com.android.tools.r8.com.google.gson.internal.Excluder com.android.tools.r8.com.google.gson.internal.Excluder.clone():63:65 -> clone
     1:3:java.lang.Object clone():50 -> clone
-com.android.tools.r8.com.google.gson.internal.Excluder$1 -> com.android.tools.r8.internal.Tj:
+com.android.tools.r8.com.google.gson.internal.Excluder$1 -> com.android.tools.r8.internal.Yj:
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> a
     com.android.tools.r8.com.google.gson.reflect.TypeToken val$type -> e
     com.android.tools.r8.com.google.gson.internal.Excluder this$0 -> f
@@ -13716,11 +13757,11 @@
     10:13:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.internal.Excluder$1.delegate():141:144 -> a
     10:13:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):137 -> a
     14:14:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):137:137 -> a
-com.android.tools.r8.com.google.gson.internal.JsonReaderInternalAccess -> com.android.tools.r8.internal.qx:
+com.android.tools.r8.com.google.gson.internal.JsonReaderInternalAccess -> com.android.tools.r8.internal.wx:
     com.android.tools.r8.com.google.gson.internal.JsonReaderInternalAccess INSTANCE -> a
     1:1:void <init>():25:25 -> <init>
     void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader) -> a
-com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.EC:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.KC:
     java.lang.String value -> b
     1:2:void <init>(java.lang.String):30:31 -> <init>
     1:1:double doubleValue():63:63 -> doubleValue
@@ -13730,7 +13771,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.QD:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.XD:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node root -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node header -> f
     boolean $assertionsDisabled -> j
@@ -13775,12 +13816,12 @@
     2:2:java.lang.Object remove(java.lang.Object):111 -> remove
     3:3: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.JD:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.QD:
     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.LD:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.SD:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):560:560 -> <init>
     1:1:void clear():591:591 -> clear
@@ -13809,7 +13850,7 @@
     9:9:boolean remove(java.lang.Object):582 -> remove
     10:10:boolean remove(java.lang.Object):586: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.KD:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.RD:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet):566:566 -> <init>
     1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():539:547 -> next
     1:9:java.util.Map$Entry com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1.next():568 -> next
@@ -13820,7 +13861,7 @@
     11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():541:541 -> next
     11:11:java.util.Map$Entry com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1.next():568 -> next
     11:11:java.lang.Object next():566 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.ND:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.UD:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):595:595 -> <init>
     1:1:void clear():617:617 -> clear
@@ -13833,7 +13874,7 @@
     3:3:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.removeInternalByKey(java.lang.Object):279:279 -> remove
     3:3: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.MD:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.TD:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet):601:601 -> <init>
     1:9:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():539:547 -> next
     1:9:java.lang.Object next():603 -> next
@@ -13842,7 +13883,7 @@
     11:11:java.lang.Object next():603 -> next
     12:12:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator.nextNode():541:541 -> next
     12:12:java.lang.Object next():603 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.OD:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.VD:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node lastReturned -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> e
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> b
@@ -13852,7 +13893,7 @@
     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.PD:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.WD:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node right -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node left -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node prev -> f
@@ -13869,9 +13910,9 @@
     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.ObjectConstructor -> com.android.tools.r8.internal.VL:
+com.android.tools.r8.com.google.gson.internal.ObjectConstructor -> com.android.tools.r8.internal.mM:
     java.lang.Object construct() -> a
-com.android.tools.r8.com.google.gson.internal.Primitives -> com.android.tools.r8.internal.TO:
+com.android.tools.r8.com.google.gson.internal.Primitives -> com.android.tools.r8.internal.lP:
     java.util.Map PRIMITIVE_TO_WRAPPER_TYPE -> a
     1:4:void <clinit>():45:48 -> <clinit>
     5:6:void com.android.tools.r8.com.google.gson.internal.Primitives.add(java.util.Map,java.util.Map,java.lang.Class,java.lang.Class):64:65 -> <clinit>
@@ -13902,7 +13943,7 @@
     29:30:void <clinit>():56 -> <clinit>
     31:32:void <clinit>():58:59 -> <clinit>
     1:1:boolean isPrimitive(java.lang.reflect.Type):72:72 -> a
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator -> com.android.tools.r8.internal.K30:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator -> com.android.tools.r8.internal.g40:
     1:1:void <init>():31:31 -> <init>
     1:62:com.android.tools.r8.com.google.gson.internal.UnsafeAllocator create():40:101 -> a
     63:68:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.assertInstantiable(java.lang.Class):115:120 -> a
@@ -13930,21 +13971,21 @@
     73:73:void com.android.tools.r8.com.google.gson.internal.UnsafeAllocator.assertInstantiable(java.lang.Class):117:117 -> a
     73:73:void access$000(java.lang.Class):31 -> a
     java.lang.Object newInstance(java.lang.Class) -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$1 -> com.android.tools.r8.internal.G30:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$1 -> com.android.tools.r8.internal.c40:
     java.lang.Object val$unsafe -> b
     java.lang.reflect.Method val$allocateInstance -> a
     1:1:void <init>(java.lang.reflect.Method,java.lang.Object):45:45 -> <init>
     1:2:java.lang.Object newInstance(java.lang.Class):49:50 -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$2 -> com.android.tools.r8.internal.H30:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$2 -> com.android.tools.r8.internal.d40:
     int val$constructorId -> b
     java.lang.reflect.Method val$newInstance -> a
     1:1:void <init>(java.lang.reflect.Method,int):69:69 -> <init>
     1:2:java.lang.Object newInstance(java.lang.Class):73:74 -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$3 -> com.android.tools.r8.internal.I30:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$3 -> com.android.tools.r8.internal.e40:
     java.lang.reflect.Method val$newInstance -> a
     1:1:void <init>(java.lang.reflect.Method):89:89 -> <init>
     1:2:java.lang.Object newInstance(java.lang.Class):93:94 -> b
-com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$4 -> com.android.tools.r8.internal.J30:
+com.android.tools.r8.com.google.gson.internal.UnsafeAllocator$4 -> com.android.tools.r8.internal.f40:
     1:1:void <init>():101:101 -> <init>
     1:1:java.lang.Object newInstance(java.lang.Class):104:104 -> b
 com.android.tools.r8.com.google.gson.internal.bind.ArrayTypeAdapter -> com.android.tools.r8.internal.w3:
@@ -13961,11 +14002,11 @@
     3:5:java.lang.reflect.Type com.android.tools.r8.com.google.gson.internal.$Gson$Types.getArrayComponentType(java.lang.reflect.Type):280:282 -> a
     3:5:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):47 -> a
     6:8:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):48:50 -> a
-com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory -> com.android.tools.r8.internal.tc:
+com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory -> com.android.tools.r8.internal.wc:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     1:2:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):39:40 -> <init>
     1:13:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):45:57 -> a
-com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.sc:
+com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.vc:
     com.android.tools.r8.com.google.gson.TypeAdapter elementTypeAdapter -> a
     com.android.tools.r8.com.google.gson.internal.ObjectConstructor constructor -> b
     1:4:void <init>(com.android.tools.r8.com.google.gson.Gson,java.lang.reflect.Type,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.internal.ObjectConstructor):67:70 -> <init>
@@ -13974,7 +14015,7 @@
     2:10:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):61 -> a
     11:22:java.util.Collection com.android.tools.r8.com.google.gson.internal.bind.CollectionTypeAdapterFactory$Adapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):74:85 -> a
     11:22:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):61 -> a
-com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter -> com.android.tools.r8.internal.Ue:
+com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter -> com.android.tools.r8.internal.Ye:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> c
     java.text.DateFormat localFormat -> b
     java.text.DateFormat enUsFormat -> a
@@ -13991,16 +14032,16 @@
     31:31:java.util.Date com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter.deserializeToDate(java.lang.String):74:74 -> a
     31:31:java.util.Date com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):59 -> a
     31:31:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):41 -> a
-com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter$1 -> com.android.tools.r8.internal.Te:
+com.android.tools.r8.com.google.gson.internal.bind.DateTypeAdapter$1 -> com.android.tools.r8.internal.Xe:
     1:1:void <init>():42:42 -> <init>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):45:45 -> a
-com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory -> com.android.tools.r8.internal.fx:
+com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory -> com.android.tools.r8.internal.lx:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     1:2:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor):37:38 -> <init>
     1:6:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):44:49 -> a
     7:29:com.android.tools.r8.com.google.gson.TypeAdapter getTypeAdapter(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,com.android.tools.r8.com.google.gson.annotations.JsonAdapter):55:77 -> a
     30:30:com.android.tools.r8.com.google.gson.TypeAdapter getTypeAdapter(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,com.android.tools.r8.com.google.gson.annotations.JsonAdapter):71:71 -> a
-com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter -> com.android.tools.r8.internal.ux:
+com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter -> com.android.tools.r8.internal.Ax:
     java.io.Writer UNWRITABLE_WRITER -> p
     com.android.tools.r8.com.google.gson.JsonPrimitive SENTINEL_CLOSED -> q
     java.lang.String pendingName -> n
@@ -14058,12 +14099,12 @@
     74:74:com.android.tools.r8.com.google.gson.JsonElement get():66:66 -> o
     75:75:com.android.tools.r8.com.google.gson.JsonElement get():66:66 -> o
     72:72:com.android.tools.r8.com.google.gson.JsonElement get():66:66 -> o
-com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter$1 -> com.android.tools.r8.internal.tx:
+com.android.tools.r8.com.google.gson.internal.bind.JsonTreeWriter$1 -> com.android.tools.r8.internal.zx:
     1:1:void <init>():34:34 -> <init>
     1:1:void close():42:42 -> close
     1:1:void flush():39:39 -> flush
     1:1:void write(char[],int,int):36:36 -> write
-com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory -> com.android.tools.r8.internal.jF:
+com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory -> com.android.tools.r8.internal.qF:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     boolean complexMapKeySerialization -> c
     1:3:void <init>(com.android.tools.r8.com.google.gson.internal.ConstructorConstructor,boolean):110:112 -> <init>
@@ -14071,7 +14112,7 @@
     11:14:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory.getKeyAdapter(com.android.tools.r8.com.google.gson.Gson,java.lang.reflect.Type):140:140 -> a
     11:14:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):125 -> a
     15:20:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):126:131 -> a
-com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.iF:
+com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.pF:
     com.android.tools.r8.com.google.gson.TypeAdapter keyTypeAdapter -> a
     com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory this$0 -> d
     com.android.tools.r8.com.google.gson.TypeAdapter valueTypeAdapter -> b
@@ -14137,7 +14178,7 @@
     62:80:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):145 -> a
     81:97:java.util.Map com.android.tools.r8.com.google.gson.internal.bind.MapTypeAdapterFactory$Adapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):177:193 -> a
     81:97:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):145 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter -> com.android.tools.r8.internal.sM:
+com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter -> com.android.tools.r8.internal.JM:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
     com.android.tools.r8.com.google.gson.Gson gson -> a
     1:1:void <clinit>():38:38 -> <clinit>
@@ -14156,10 +14197,10 @@
     58:58:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getAdapter(java.lang.Class):521:521 -> a
     58:58:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):100 -> a
     59:65:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):101:107 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter$1 -> com.android.tools.r8.internal.rM:
+com.android.tools.r8.com.google.gson.internal.bind.ObjectTypeAdapter$1 -> com.android.tools.r8.internal.IM:
     1:1:void <init>():38:38 -> <init>
     1:2:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):41:42 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory -> com.android.tools.r8.internal.uU:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory -> com.android.tools.r8.internal.PU:
     com.android.tools.r8.com.google.gson.internal.ConstructorConstructor constructorConstructor -> b
     com.android.tools.r8.com.google.gson.internal.Excluder excluder -> d
     com.android.tools.r8.com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory jsonAdapterFactory -> e
@@ -14182,7 +14223,7 @@
     61:70:java.util.Map com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory.getBoundFields(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,java.lang.Class):166:175 -> a
     61:70:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):100 -> a
     71:71:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):100:100 -> a
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1 -> com.android.tools.r8.internal.sU:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1 -> com.android.tools.r8.internal.NU:
     com.android.tools.r8.com.google.gson.reflect.TypeToken val$fieldType -> h
     boolean val$isPrimitive -> i
     java.lang.reflect.Field val$field -> d
@@ -14195,7 +14236,7 @@
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory,java.lang.String,boolean,boolean,java.lang.reflect.Field,boolean,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,boolean):118:118 -> <init>
     2:5:void com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$BoundField.<init>(java.lang.String,boolean,boolean):185:188 -> <init>
     2:5:void <init>(com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory,java.lang.String,boolean,boolean,java.lang.reflect.Field,boolean,com.android.tools.r8.com.google.gson.TypeAdapter,com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken,boolean):118 -> <init>
-com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.tU:
+com.android.tools.r8.com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter -> com.android.tools.r8.internal.OU:
     java.util.Map boundFields -> b
     com.android.tools.r8.com.google.gson.internal.ObjectConstructor constructor -> a
     1:3:void <init>(com.android.tools.r8.com.google.gson.internal.ObjectConstructor,java.util.Map):199:201 -> <init>
@@ -14216,7 +14257,7 @@
     40:43:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):243 -> a
     44:44:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):249:249 -> a
     45:45:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):247:247 -> a
-com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter -> com.android.tools.r8.internal.bY:
+com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter -> com.android.tools.r8.internal.wY:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
     java.text.DateFormat format -> a
     1:1:void <clinit>():39:39 -> <clinit>
@@ -14227,10 +14268,10 @@
     11:11:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):38:38 -> a
     12:12:void com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.sql.Date):65:65 -> a
     12:12:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):38 -> a
-com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter$1 -> com.android.tools.r8.internal.aY:
+com.android.tools.r8.com.google.gson.internal.bind.SqlDateTypeAdapter$1 -> com.android.tools.r8.internal.vY:
     1:1:void <init>():39:39 -> <init>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):42:42 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter -> com.android.tools.r8.internal.a10:
+com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter -> com.android.tools.r8.internal.w10:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory FACTORY -> b
     java.text.DateFormat format -> a
     1:1:void <clinit>():41:41 -> <clinit>
@@ -14241,10 +14282,10 @@
     11:11:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):40:40 -> a
     12:12:void com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.sql.Time):64:64 -> a
     12:12:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):40 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter$1 -> com.android.tools.r8.internal.Z00:
+com.android.tools.r8.com.google.gson.internal.bind.TimeTypeAdapter$1 -> com.android.tools.r8.internal.v10:
     1:1:void <init>():41:41 -> <init>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):44:44 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper -> com.android.tools.r8.internal.W10:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper -> com.android.tools.r8.internal.s20:
     java.lang.reflect.Type type -> c
     com.android.tools.r8.com.google.gson.TypeAdapter delegate -> b
     com.android.tools.r8.com.google.gson.Gson context -> a
@@ -14254,7 +14295,7 @@
     4:6:java.lang.reflect.Type com.android.tools.r8.com.google.gson.internal.bind.TypeAdapterRuntimeTypeWrapper.getRuntimeTypeIfMoreSpecific(java.lang.reflect.Type,java.lang.Object):76:78 -> a
     4:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):54 -> a
     7:21:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):55:69 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.I20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.e30:
     com.android.tools.r8.com.google.gson.TypeAdapterFactory INET_ADDRESS_FACTORY -> u
     com.android.tools.r8.com.google.gson.TypeAdapterFactory URL_FACTORY -> s
     com.android.tools.r8.com.google.gson.TypeAdapterFactory CALENDAR_FACTORY -> y
@@ -14353,7 +14394,7 @@
     361:398:void <clinit>():787:824 -> <clinit>
     1:1:com.android.tools.r8.com.google.gson.TypeAdapterFactory newFactory(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):850:850 -> a
     2:2:com.android.tools.r8.com.google.gson.TypeAdapterFactory newFactory(java.lang.Class,java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):863:863 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.h20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.D20:
     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:4: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:75 -> a
@@ -14370,35 +14411,35 @@
     6:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):69 -> a
     10:14: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
     10:14: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.X10:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.internal.t20:
     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$11 -> com.android.tools.r8.internal.Y10:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11 -> com.android.tools.r8.internal.u20:
     1:1:void <init>():313:313 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):313:313 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):328:328 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):313 -> a
     3:10:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$11.read(com.android.tools.r8.com.google.gson.stream.JsonReader):316:323 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):313 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12 -> com.android.tools.r8.internal.Z10:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12 -> com.android.tools.r8.internal.v20:
     1:1:void <init>():332:332 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):332:332 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):343:343 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):332 -> a
     3:7:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$12.read(com.android.tools.r8.com.google.gson.stream.JsonReader):335:339 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):332 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13 -> com.android.tools.r8.internal.a20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13 -> com.android.tools.r8.internal.w20:
     1:1:void <init>():347:347 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):347:347 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):358:358 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):347 -> a
     3:7:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$13.read(com.android.tools.r8.com.google.gson.stream.JsonReader):350:354 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):347 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.b20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.x20:
     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
@@ -14417,7 +14458,7 @@
     13:13:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
     14:14: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
     14:14: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.c20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.internal.y20:
     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
@@ -14440,35 +14481,35 @@
     19:19:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
     14:14: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
     14:14: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.d20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.internal.z20:
     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$17 -> com.android.tools.r8.internal.e20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17 -> com.android.tools.r8.internal.A20:
     1:1:void <init>():426:426 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):426:426 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.math.BigDecimal):440:440 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):426 -> a
     3:10:java.math.BigDecimal com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$17.read(com.android.tools.r8.com.google.gson.stream.JsonReader):428:435 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):426 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18 -> com.android.tools.r8.internal.f20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18 -> com.android.tools.r8.internal.B20:
     1:1:void <init>():444:444 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):444:444 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.math.BigInteger):458:458 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):444 -> a
     3:10:java.math.BigInteger com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$18.read(com.android.tools.r8.com.google.gson.stream.JsonReader):446:453 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):444 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.g20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.C20:
     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.t20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.internal.P20:
     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
@@ -14505,55 +14546,55 @@
     89:89:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
     68:81: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
     68:81: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.i20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.internal.E20:
     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.j20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.internal.F20:
     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.k20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.internal.G20:
     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.l20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.internal.H20:
     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.m20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.internal.I20:
     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.n20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.internal.J20:
     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$26 -> com.android.tools.r8.internal.p20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26 -> com.android.tools.r8.internal.L20:
     1:1:void <init>():588:588 -> <init>
     1:5:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):591:595 -> a
     6:6:com.android.tools.r8.com.google.gson.TypeAdapter com.android.tools.r8.com.google.gson.Gson.getAdapter(java.lang.Class):521:521 -> a
     6:6:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):595 -> a
     7:7:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):596:596 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26$1 -> com.android.tools.r8.internal.o20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26$1 -> com.android.tools.r8.internal.K20:
     com.android.tools.r8.com.google.gson.TypeAdapter val$dateTypeAdapter -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26,com.android.tools.r8.com.google.gson.TypeAdapter):596:596 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):596:596 -> a
@@ -14561,21 +14602,21 @@
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):596 -> a
     3:4:java.sql.Timestamp com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$26$1.read(com.android.tools.r8.com.google.gson.stream.JsonReader):598:599 -> a
     3:4:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):596 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.q20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.M20:
     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.r20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.internal.N20:
     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.s20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.O20:
     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
@@ -14607,17 +14648,17 @@
     37:38:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):720:721 -> b
     39:62:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):718:741 -> b
     63:68:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):728:733 -> b
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.A20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.W20:
     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$30 -> com.android.tools.r8.internal.u20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$30 -> com.android.tools.r8.internal.Q20:
     1:1:void <init>():824:824 -> <init>
     1:8:com.android.tools.r8.com.google.gson.TypeAdapter create(com.android.tools.r8.com.google.gson.Gson,com.android.tools.r8.com.google.gson.reflect.TypeToken):827:834 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$32 -> com.android.tools.r8.internal.v20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$32 -> com.android.tools.r8.internal.R20:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> c
     java.lang.Class val$type -> b
     1:1:void <init>(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):850:850 -> <init>
@@ -14628,7 +14669,7 @@
     859:859:java.lang.String toString():856:856 -> toString
     860:860:java.lang.String toString():856:856 -> toString
     857:857:java.lang.String toString():856:856 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$33 -> com.android.tools.r8.internal.w20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$33 -> com.android.tools.r8.internal.S20:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> d
     java.lang.Class val$unboxed -> b
     java.lang.Class val$boxed -> c
@@ -14640,7 +14681,7 @@
     874:874:java.lang.String toString():870:870 -> toString
     875:875:java.lang.String toString():870:870 -> toString
     871:872:java.lang.String toString():870:871 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34 -> com.android.tools.r8.internal.x20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$34 -> com.android.tools.r8.internal.T20:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> d
     java.lang.Class val$base -> b
     java.lang.Class val$sub -> c
@@ -14652,7 +14693,7 @@
     889:889:java.lang.String toString():885:885 -> toString
     890:890:java.lang.String toString():885:885 -> toString
     886:887:java.lang.String toString():885:886 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35 -> com.android.tools.r8.internal.z20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35 -> com.android.tools.r8.internal.V20:
     com.android.tools.r8.com.google.gson.TypeAdapter val$typeAdapter -> c
     java.lang.Class val$clazz -> b
     1:1:void <init>(java.lang.Class,com.android.tools.r8.com.google.gson.TypeAdapter):897:897 -> <init>
@@ -14663,7 +14704,7 @@
     923:923:java.lang.String toString():920:920 -> toString
     924:924:java.lang.String toString():920:920 -> toString
     921:921:java.lang.String toString():920:920 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35$1 -> com.android.tools.r8.internal.y20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35$1 -> com.android.tools.r8.internal.U20:
     com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35 this$0 -> b
     java.lang.Class val$requestedType -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$35,java.lang.Class):904:904 -> <init>
@@ -14675,49 +14716,49 @@
     920:920:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):912:912 -> a
     921:921:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):912:912 -> a
     917:918:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):912:913 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4 -> com.android.tools.r8.internal.B20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4 -> com.android.tools.r8.internal.X20:
     1:1:void <init>():173:173 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):173:173 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Boolean):183:183 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):173 -> a
     3:7:java.lang.Boolean com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$4.read(com.android.tools.r8.com.google.gson.stream.JsonReader):175:179 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):173 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.C20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.Y20:
     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.D20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.internal.Z20:
     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.E20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.internal.a30:
     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.F20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.internal.b30:
     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.G20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.internal.c30:
     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.internal.bind.TypeAdapters$EnumTypeAdapter -> com.android.tools.r8.internal.H20:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter -> com.android.tools.r8.internal.d30:
     java.util.Map nameToConstant -> a
     java.util.Map constantToName -> b
     1:1:void <init>(java.lang.Class):793:793 -> <init>
@@ -14727,7 +14768,7 @@
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):789 -> a
     3:7:java.lang.Enum com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$EnumTypeAdapter.read(com.android.tools.r8.com.google.gson.stream.JsonReader):812:816 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):789 -> a
-com.android.tools.r8.com.google.gson.internal.bind.util.ISO8601Utils -> com.android.tools.r8.internal.yo:
+com.android.tools.r8.com.google.gson.internal.bind.util.ISO8601Utils -> com.android.tools.r8.internal.Do:
     java.util.TimeZone TIMEZONE_UTC -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:52:java.util.Date parse(java.lang.String,java.text.ParsePosition):126:177 -> a
@@ -14768,7 +14809,7 @@
     1499:1499:int parseInt(java.lang.String,int,int):318:318 -> a
     1478:1478:int parseInt(java.lang.String,int,int):318:318 -> a
     1479:1479:int parseInt(java.lang.String,int,int):302:302 -> a
-com.android.tools.r8.com.google.gson.reflect.TypeToken -> com.android.tools.r8.internal.Y20:
+com.android.tools.r8.com.google.gson.reflect.TypeToken -> com.android.tools.r8.internal.u30:
     java.lang.reflect.Type type -> b
     java.lang.Class rawType -> a
     int hashCode -> c
@@ -14783,7 +14824,7 @@
     1:2:boolean equals(java.lang.Object):284:285 -> equals
     1:1:int hashCode():280:280 -> hashCode
     1:1:java.lang.String toString():289:289 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.px:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.vx:
     long peekedLong -> j
     int stackSize -> n
     char[] buffer -> d
@@ -15006,7 +15047,7 @@
     28:52:void com.android.tools.r8.com.google.gson.stream.JsonReader.skipUnquotedValue():1117:1141 -> v
     28:52:void skipValue():1240 -> v
     53:57:void skipValue():1248:1252 -> v
-com.android.tools.r8.com.google.gson.stream.JsonReader$1 -> com.android.tools.r8.internal.ox:
+com.android.tools.r8.com.google.gson.stream.JsonReader$1 -> com.android.tools.r8.internal.ux:
     1:1:void <init>():1585:1585 -> <init>
     1:12:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1591:1602 -> a
     13:13:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):0:0 -> a
@@ -15015,12 +15056,12 @@
     1618:1618:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1602:1602 -> a
     1619:1619:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1602:1602 -> a
     1616:1616:void promoteNameToValue(com.android.tools.r8.com.google.gson.stream.JsonReader):1603:1603 -> a
-com.android.tools.r8.com.google.gson.stream.JsonToken$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.sx:
+com.android.tools.r8.com.google.gson.stream.JsonToken$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.yx:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.vx:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.Bx:
     java.lang.String separator -> f
     java.lang.String[] HTML_SAFE_REPLACEMENT_CHARS -> l
     java.lang.String deferredName -> i
@@ -15110,7 +15151,7 @@
     15:15:int com.android.tools.r8.com.google.gson.stream.JsonWriter.peek():367:367 -> n
     15:15:void com.android.tools.r8.com.google.gson.stream.JsonWriter.beforeName():612 -> n
     15:15:void writeDeferredName():401 -> n
-com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.gF:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.nF:
     1:1:void <init>(java.lang.String):29:29 -> <init>
 com.android.tools.r8.compatproguard.CompatProguard -> com.android.tools.r8.compatproguard.CompatProguard:
     1:29:void run(java.lang.String[]):219:247 -> a
@@ -15186,7 +15227,7 @@
     89:109:com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions parse(java.lang.String[]):154:174 -> a
 com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions$1 -> com.android.tools.r8.compatproguard.a:
     1:1:void <init>():88:88 -> <init>
-com.android.tools.r8.compatproguard.DepsFileWriter -> com.android.tools.r8.internal.Hf:
+com.android.tools.r8.compatproguard.DepsFileWriter -> com.android.tools.r8.internal.Lf:
     java.util.Set dependencies -> c
     java.nio.file.Path dependentFile -> a
     java.lang.String dependencyOutput -> b
@@ -15201,7 +15242,7 @@
     17:17:void finished():51 -> finished
     18:21:void finished():51:54 -> finished
     22:36:void finished():41:55 -> finished
-com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.Vc:
+com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.Yc:
     java.util.Map seenSetForTesting -> c
     java.lang.Thread mainThread -> b
     java.util.function.Consumer testingConsumer -> a
@@ -15223,7 +15264,7 @@
     70:70:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):54:54 -> a
     65:65:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):54:54 -> a
     71:73:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():67:69 -> a
-com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext -> com.android.tools.r8.internal.Oc:
+com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext -> com.android.tools.r8.internal.Rc:
     com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring desugaring -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():180:180 -> <clinit>
@@ -15232,12 +15273,12 @@
     1:3:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):191:193 -> a
     4:5:com.android.tools.r8.contexts.CompilationContext$UniqueContext createUniqueContext(com.android.tools.r8.graph.DexProgramClass):202:203 -> a
     1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):198:198 -> b
-com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.Pc:
+com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.Sc:
     1:1:void <init>():18:18 -> <init>
     2:2:void <init>(com.android.tools.r8.contexts.CompilationContext$1):18:18 -> <init>
     java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder) -> a
     java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder) -> b
-com.android.tools.r8.contexts.CompilationContext$MainThreadContext -> com.android.tools.r8.internal.Qc:
+com.android.tools.r8.contexts.CompilationContext$MainThreadContext -> com.android.tools.r8.internal.Tc:
     java.lang.Thread mainThread -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():151:151 -> <clinit>
@@ -15246,7 +15287,7 @@
     1:1:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):164:164 -> a
     2:4:com.android.tools.r8.contexts.CompilationContext$UniqueContext createUniqueContext(com.android.tools.r8.graph.DexProgramClass):173:175 -> a
     1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):169:169 -> b
-com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.android.tools.r8.internal.Rc:
+com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext -> com.android.tools.r8.internal.Uc:
     com.android.tools.r8.graph.ProgramMethod method -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():209:209 -> <clinit>
@@ -15265,7 +15306,7 @@
     2:2:com.android.tools.r8.contexts.CompilationContext$UniqueContext createUniqueContext():226 -> c
     3:4:com.android.tools.r8.contexts.CompilationContext$UniqueContext createUniqueContext():226:227 -> c
     1:1:com.android.tools.r8.graph.ProgramMethod getMethodContext():236:236 -> d
-com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.Sc:
+com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.Vc:
     com.android.tools.r8.contexts.CompilationContext parent -> a
     int processorId -> b
     boolean $assertionsDisabled -> c
@@ -15293,7 +15334,7 @@
     15:15:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):120 -> a
     1:1:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):115:115 -> b
     1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):125 -> b
-com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext -> com.android.tools.r8.internal.Tc:
+com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext -> com.android.tools.r8.internal.Wc:
     int nextId -> b
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext parent -> a
     1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.contexts.CompilationContext$1):130:130 -> <init>
@@ -15301,7 +15342,7 @@
     3:6:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):132:135 -> <init>
     1:1:com.android.tools.r8.contexts.CompilationContext$ProcessorContext getParent():139:139 -> a
     1:1:int incrementAndGetNextId():143:143 -> b
-com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.Uc:
+com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.Xc:
     com.android.tools.r8.graph.DexProgramClass classContext -> b
     com.android.tools.r8.contexts.CompilationContext$ThreadTaskContext parent -> a
     int positionId -> c
@@ -15315,62 +15356,70 @@
     2:2:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSuffix(java.lang.StringBuilder):274:274 -> b
     2:2:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):284 -> b
     3:3:java.lang.String getSyntheticSuffix():292:292 -> b
-com.android.tools.r8.debuginfo.DebugRepresentation -> com.android.tools.r8.internal.lf:
+com.android.tools.r8.debuginfo.DebugRepresentation -> com.android.tools.r8.internal.pf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap paramToInfo -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():30:30 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):67:68 -> <init>
-    boolean lambda$fromFiles$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
-    1:1:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):38:38 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2071:2071 -> a
-    2:2:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):38 -> a
+    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):73:74 -> <init>
+    int lambda$fromFiles$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
+    1:1:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):41:41 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2051:2051 -> a
+    2:2:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):41 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2071:2071 -> a
-    3:3:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):38 -> a
-    4:5:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):38:39 -> a
-    6:6:void lambda$fromFiles$2(java.util.Map,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.DexProgramClass):53:53 -> a
-    7:7:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):72:72 -> a
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2071:2071 -> a
-    8:8:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):73 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2051:2051 -> a
+    3:3:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):41 -> a
+    4:5:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate none(com.android.tools.r8.utils.InternalOptions):41:42 -> a
+    6:6:void lambda$fromFiles$2(java.util.Map,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.graph.DexProgramClass):56:56 -> a
+    7:7:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):78:78 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2051:2051 -> a
+    8:8:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):79 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2071:2071 -> a
-    9:9:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):73 -> a
-    10:16:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):74:80 -> a
-    17:17:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():119:119 -> a
-    17:17:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):80 -> a
-    18:27:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):81:90 -> a
-    28:32:boolean com.android.tools.r8.debuginfo.DebugRepresentation.isPcCandidate(com.android.tools.r8.graph.DexEncodedMethod):138:142 -> a
-    28:32:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):91 -> a
-    33:34:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):94:95 -> a
-    35:36:com.android.tools.r8.dex.code.DexInstruction com.android.tools.r8.debuginfo.DebugRepresentation.getLastExecutableInstruction(com.android.tools.r8.graph.DexCode):268:269 -> a
-    35:36:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):96 -> a
-    37:37:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):100:100 -> a
-    38:49:int com.android.tools.r8.debuginfo.DebugRepresentation.estimatedDebugInfoSize(com.android.tools.r8.graph.DexDebugInfo):277:288 -> a
-    38:49:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):101 -> a
-    50:58:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):103:111 -> a
-    59:59:com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary lambda$computeForFile$4(int):103:103 -> a
-    60:60:void lambda$computeForFile$5(java.lang.Integer,com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):108:108 -> a
-    61:61:java.lang.Integer lambda$toString$6(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):133:133 -> a
-    62:66:boolean com.android.tools.r8.debuginfo.DebugRepresentation.isPcCandidate(com.android.tools.r8.graph.DexEncodedMethod):138:142 -> a
-    62:66:boolean lambda$fromFiles$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):56 -> a
-    67:69:boolean lambda$fromFiles$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):59:61 -> a
-    70:74:boolean com.android.tools.r8.debuginfo.DebugRepresentation.usesPcEncoding(com.android.tools.r8.graph.DexEncodedMethod):115:119 -> a
-    70:74:boolean lambda$fromFiles$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):61 -> a
-    75:76:com.android.tools.r8.dex.code.DexInstruction com.android.tools.r8.debuginfo.DebugRepresentation.getLastExecutableInstruction(com.android.tools.r8.graph.DexCode):268:269 -> a
-    75:76:boolean com.android.tools.r8.debuginfo.DebugRepresentation.usesPcEncoding(com.android.tools.r8.graph.DexEncodedMethod):122 -> a
-    75:76:boolean lambda$fromFiles$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):61 -> a
-    77:78:boolean com.android.tools.r8.debuginfo.DebugRepresentation.usesPcEncoding(com.android.tools.r8.graph.DexEncodedMethod):126:127 -> a
-    77:78:boolean lambda$fromFiles$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):61 -> a
-    79:79:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2071:2071 -> a
-    79:79:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):44 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2051:2051 -> a
+    9:9:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):79 -> a
+    10:15:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):80:85 -> a
+    16:16:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():119:119 -> a
+    16:16:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):85 -> a
+    17:26:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):86:95 -> a
+    27:31:boolean com.android.tools.r8.debuginfo.DebugRepresentation.isPcCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.InternalOptions):153:157 -> a
+    27:31:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):96 -> a
+    32:39:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):99:106 -> a
+    40:42:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo com.android.tools.r8.utils.LineNumberOptimizer.createEventBasedInfoForMethodWithoutDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):1169:1171 -> a
+    40:42:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):105 -> a
+    43:43:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):108:108 -> a
+    44:45:com.android.tools.r8.dex.code.DexInstruction com.android.tools.r8.debuginfo.DebugRepresentation.getLastExecutableInstruction(com.android.tools.r8.graph.DexCode):291:292 -> a
+    44:45:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):109 -> a
+    46:46:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):113:113 -> a
+    47:58:int com.android.tools.r8.debuginfo.DebugRepresentation.estimatedDebugInfoSize(com.android.tools.r8.graph.DexDebugInfo):300:311 -> a
+    47:58:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):114 -> a
+    59:67:void computeForFile(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.VirtualFile):116:124 -> a
+    68:68:com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary lambda$computeForFile$4(int):116:116 -> a
+    69:69:void lambda$computeForFile$5(com.android.tools.r8.graph.AppView,java.lang.Integer,com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):121:121 -> a
+    70:70:java.lang.Integer lambda$toString$6(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):148:148 -> a
+    71:75:boolean com.android.tools.r8.debuginfo.DebugRepresentation.isPcCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.InternalOptions):153:157 -> a
+    71:75:int lambda$fromFiles$3(com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):59 -> a
+    76:78:int lambda$fromFiles$3(com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):62:64 -> a
+    79:83:int com.android.tools.r8.debuginfo.DebugRepresentation.getDexPcEncodingCutoff(com.android.tools.r8.graph.DexEncodedMethod):128:132 -> a
+    79:83:int lambda$fromFiles$3(com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):64 -> a
+    84:85:com.android.tools.r8.dex.code.DexInstruction com.android.tools.r8.debuginfo.DebugRepresentation.getLastExecutableInstruction(com.android.tools.r8.graph.DexCode):291:292 -> a
+    84:85:int com.android.tools.r8.debuginfo.DebugRepresentation.getDexPcEncodingCutoff(com.android.tools.r8.graph.DexEncodedMethod):137 -> a
+    84:85:int lambda$fromFiles$3(com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):64 -> a
+    86:87:int com.android.tools.r8.debuginfo.DebugRepresentation.getDexPcEncodingCutoff(com.android.tools.r8.graph.DexEncodedMethod):141:142 -> a
+    86:87:int lambda$fromFiles$3(com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):64 -> a
+    88:88:int com.android.tools.r8.debuginfo.DebugRepresentation.getDexPcEncodingCutoff(com.android.tools.r8.graph.DexEncodedMethod):134:134 -> a
+    88:88:int lambda$fromFiles$3(com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):64 -> a
+    89:89:int lambda$fromFiles$3(com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):66:66 -> a
+    90:91:com.android.tools.r8.dex.code.DexInstruction com.android.tools.r8.debuginfo.DebugRepresentation.getLastExecutableInstruction(com.android.tools.r8.graph.DexCode):291:292 -> a
+    90:91:boolean verifyLastExecutableInstructionWithinBound(com.android.tools.r8.graph.DexCode,int):283 -> a
+    92:93:boolean verifyLastExecutableInstructionWithinBound(com.android.tools.r8.graph.DexCode,int):284:285 -> a
+    94:94:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2051:2051 -> a
+    94:94:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):47 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    80:80:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2071:2071 -> a
-    80:80:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):44 -> a
-    81:91:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):45:55 -> a
-    92:92:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):48:48 -> a
-    boolean lambda$none$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> b
-    1:3:java.lang.String toString():132:134 -> toString
-com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary -> com.android.tools.r8.internal.if:
+    95:95:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2051:2051 -> a
+    95:95:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):47 -> a
+    96:106:com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate fromFiles(java.util.List,com.android.tools.r8.utils.InternalOptions):48:58 -> a
+    int lambda$none$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> b
+    1:3:java.lang.String toString():147:149 -> toString
+com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary -> com.android.tools.r8.internal.mf:
     int normalPreCutoffCost -> f
     int normalPostCutoffCost -> g
     int maxPc -> d
@@ -15379,77 +15428,68 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap pcToCost -> b
     int minPc -> c
     int paramCount -> a
-    1:1:void <clinit>():165:165 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.debuginfo.DebugRepresentation$1):165:165 -> <init>
-    2:2:void <init>(int):179:179 -> <init>
-    3:14:void <init>(int):170:181 -> <init>
-    1:1:void access$000(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary,int,int):165:165 -> a
-    2:2:int access$100(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165:165 -> a
-    3:4:void addCost(int,int):185:186 -> a
-    5:7:void com.android.tools.r8.debuginfo.DebugRepresentation$PcNormalCost.add(int):158:160 -> a
-    5:7:void addCost(int,int):186 -> a
-    8:9:void addCost(int,int):187:188 -> a
-    1:1:int access$200(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165:165 -> b
-    1:1:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():192:192 -> c
-    1:1:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165 -> c
-    2:2:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():192:192 -> c
-    2:2:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():192:192 -> c
-    3:3:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165 -> c
-    11:11:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():200:200 -> c
-    11:11:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165 -> c
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:37:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():200:225 -> c
-    12:37:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165 -> c
-    38:38:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():231:231 -> c
-    38:38:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():226 -> c
-    38:38:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165 -> c
-    39:41:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):152:154 -> c
-    39:41:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():231 -> c
-    39:41:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():226 -> c
-    39:41:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165 -> c
-    42:42:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():226:226 -> c
-    42:42:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165 -> c
-    43:43:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():235:235 -> c
-    43:43:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():227 -> c
-    43:43:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165 -> c
-    44:46:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):152:154 -> c
-    44:46:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():235 -> c
-    44:46:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():227 -> c
-    44:46:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165 -> c
-    47:47:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts():227:227 -> c
-    47:47:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):165 -> c
-    1:13:java.lang.String toString():240:252 -> toString
-    14:14:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():231:231 -> toString
-    14:14:java.lang.String toString():253 -> toString
-    15:17:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):152:154 -> toString
-    15:17:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():231 -> toString
-    15:17:java.lang.String toString():253 -> toString
-    18:24:java.lang.String toString():253:259 -> toString
-    25:25:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():235:235 -> toString
-    25:25:java.lang.String toString():260 -> toString
-    26:28:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):152:154 -> toString
-    26:28:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():235 -> toString
-    26:28:java.lang.String toString():260 -> toString
-    29:31:java.lang.String toString():260:262 -> toString
-com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate -> com.android.tools.r8.internal.jf:
-    boolean useDexPcEncoding(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.debuginfo.DebugRepresentation$PcNormalCost -> com.android.tools.r8.internal.kf:
+    1:1:void <clinit>():180:180 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.debuginfo.DebugRepresentation$1):180:180 -> <init>
+    2:2:void <init>(int):194:194 -> <init>
+    3:14:void <init>(int):185:196 -> <init>
+    1:1:void access$000(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary,int,int):180:180 -> a
+    2:2:int access$100(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):180:180 -> a
+    3:3:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary,com.android.tools.r8.graph.AppView):180:180 -> a
+    4:38:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts(com.android.tools.r8.graph.AppView):207:241 -> a
+    4:38:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary,com.android.tools.r8.graph.AppView):180 -> a
+    39:39:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():247:247 -> a
+    39:39:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts(com.android.tools.r8.graph.AppView):242 -> a
+    39:39:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary,com.android.tools.r8.graph.AppView):180 -> a
+    40:42:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):157:159 -> a
+    40:42:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():247 -> a
+    40:42:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts(com.android.tools.r8.graph.AppView):242 -> a
+    40:42:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary,com.android.tools.r8.graph.AppView):180 -> a
+    43:43:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts(com.android.tools.r8.graph.AppView):242:242 -> a
+    43:43:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary,com.android.tools.r8.graph.AppView):180 -> a
+    44:44:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():251:251 -> a
+    44:44:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts(com.android.tools.r8.graph.AppView):243 -> a
+    44:44:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary,com.android.tools.r8.graph.AppView):180 -> a
+    45:47:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):157:159 -> a
+    45:47:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():251 -> a
+    45:47:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts(com.android.tools.r8.graph.AppView):243 -> a
+    45:47:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary,com.android.tools.r8.graph.AppView):180 -> a
+    48:48:void com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.computeConversionCosts(com.android.tools.r8.graph.AppView):243:243 -> a
+    48:48:void access$300(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary,com.android.tools.r8.graph.AppView):180 -> a
+    49:50:void addCost(int,int):200:201 -> a
+    51:53:void com.android.tools.r8.debuginfo.DebugRepresentation$PcNormalCost.add(int):173:175 -> a
+    51:53:void addCost(int,int):201 -> a
+    54:55:void addCost(int,int):202:203 -> a
+    1:1:int access$200(com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary):180:180 -> b
+    1:13:java.lang.String toString():256:268 -> toString
+    14:14:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():247:247 -> toString
+    14:14:java.lang.String toString():269 -> toString
+    15:17:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):157:159 -> toString
+    15:17:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.preCutoffPcCost():247 -> toString
+    15:17:java.lang.String toString():269 -> toString
+    18:24:java.lang.String toString():269:275 -> toString
+    25:25:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():251:251 -> toString
+    25:25:java.lang.String toString():276 -> toString
+    26:28:int com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo.estimatedWriteSize(int,int):157:159 -> toString
+    26:28:int com.android.tools.r8.debuginfo.DebugRepresentation$CostSummary.postCutoffPcCost():251 -> toString
+    26:28:java.lang.String toString():276 -> toString
+    29:31:java.lang.String toString():276:278 -> toString
+com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate -> com.android.tools.r8.internal.nf:
+    int getDexPcEncodingCutoff(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod) -> a
+com.android.tools.r8.debuginfo.DebugRepresentation$PcNormalCost -> com.android.tools.r8.internal.of:
     boolean $assertionsDisabled -> b
     int cost -> a
-    1:1:void <clinit>():146:146 -> <clinit>
-    1:2:void <init>(int):152:153 -> <init>
-com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.hg:
+    1:1:void <clinit>():161:161 -> <clinit>
+    1:2:void <init>(int):167:168 -> <init>
+com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.lg:
     com.android.tools.r8.utils.InternalOptions options -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):49:51 -> <init>
     1:1:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():63:63 -> a
     1:1:void runIfNecessary(com.android.tools.r8.utils.Timing):55 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     2:2:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():63 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:void runIfNecessary(com.android.tools.r8.utils.Timing):55 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     3:3:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():63 -> a
     3:3:void runIfNecessary(com.android.tools.r8.utils.Timing):55 -> a
     4:4:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():63:63 -> a
@@ -15572,14 +15612,14 @@
     176:176:com.android.tools.r8.graph.DexType lambda$readMainDexClasses$0(java.lang.String):242:242 -> a
     177:179:void readProguardMap(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,java.util.List):305:305 -> a
     180:182:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):309:311 -> a
-    183:183:com.android.tools.r8.naming.ClassNameMapper com.android.tools.r8.naming.ClassNameMapper.mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):116:116 -> a
+    183:183:com.android.tools.r8.naming.ClassNameMapper com.android.tools.r8.naming.ClassNameMapper.mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):117:117 -> a
     183:183:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):311 -> a
     184:187:java.io.BufferedReader com.android.tools.r8.com.google.common.io.CharSource.openBufferedStream():112:115 -> a
-    184:187:com.android.tools.r8.naming.ClassNameMapper com.android.tools.r8.naming.ClassNameMapper.mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):116 -> a
+    184:187:com.android.tools.r8.naming.ClassNameMapper com.android.tools.r8.naming.ClassNameMapper.mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):117 -> a
     184:187:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):311 -> a
-    188:188:com.android.tools.r8.naming.ClassNameMapper com.android.tools.r8.naming.ClassNameMapper.mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):116:116 -> a
+    188:188:com.android.tools.r8.naming.ClassNameMapper com.android.tools.r8.naming.ClassNameMapper.mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):117:117 -> a
     188:188:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):311 -> a
-    189:189:com.android.tools.r8.naming.ClassNameMapper com.android.tools.r8.naming.ClassNameMapper.mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):115:115 -> a
+    189:189:com.android.tools.r8.naming.ClassNameMapper com.android.tools.r8.naming.ClassNameMapper.mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):116:116 -> a
     189:189:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):311 -> a
     190:197:void lambda$readProguardMap$1(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexApplication$Builder):310:317 -> a
     198:198:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
@@ -15623,10 +15663,10 @@
     59:76:com.android.tools.r8.utils.ClassProvider buildClassProvider(com.android.tools.r8.graph.ClassKind,java.util.Queue,java.util.List,com.android.tools.r8.graph.JarApplicationReader):451:468 -> a
     59:76:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):485 -> a
     77:77:void initializeLazyClassCollection(com.android.tools.r8.graph.LazyLoadedDexApplication$Builder):488:488 -> a
-    78:78:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    78:78:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     78:78:void lambda$readClassSources$1(java.util.Queue,com.android.tools.r8.graph.DexProgramClass):411 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    79:79:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    79:79:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     79:79:void lambda$readClassSources$1(java.util.Queue,com.android.tools.r8.graph.DexProgramClass):411 -> a
     80:90:boolean includeAnnotationClass(com.android.tools.r8.graph.DexProgramClass):388:398 -> a
     80:90:void lambda$readClassSources$1(java.util.Queue,com.android.tools.r8.graph.DexProgramClass):411 -> a
@@ -15663,25 +15703,25 @@
     339:340:com.android.tools.r8.utils.Timing lambda$write$2(java.util.List,com.android.tools.r8.dex.VirtualFile):328:329 -> a
     344:344:com.android.tools.r8.graph.DexString access$000(com.android.tools.r8.dex.ApplicationWriter,com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):83:83 -> a
     345:361:java.util.List distribute(java.util.concurrent.ExecutorService):191:207 -> a
-    362:362:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():525:525 -> a
+    362:362:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():530:530 -> a
     362:362:java.util.List distribute(java.util.concurrent.ExecutorService):207 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    363:363:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():525:525 -> a
+    363:363:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():530:530 -> a
     363:363:java.util.List distribute(java.util.concurrent.ExecutorService):207 -> a
     364:364:java.util.List distribute(java.util.concurrent.ExecutorService):208:208 -> a
-    365:365:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():541:541 -> a
+    365:365:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():546:546 -> a
     365:365:java.util.List distribute(java.util.concurrent.ExecutorService):212 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    366:366:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():541:541 -> a
+    366:366:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():546:546 -> a
     366:366:java.util.List distribute(java.util.concurrent.ExecutorService):212 -> a
     367:384:java.util.List distribute(java.util.concurrent.ExecutorService):212:229 -> a
-    385:385:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():525:525 -> a
+    385:385:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():530:530 -> a
     385:385:java.util.List distribute(java.util.concurrent.ExecutorService):229 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    386:386:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():525:525 -> a
+    386:386:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():530:530 -> a
     386:386:java.util.List distribute(java.util.concurrent.ExecutorService):229 -> a
     387:390:java.util.List distribute(java.util.concurrent.ExecutorService):230:233 -> a
-    391:391:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):202:202 -> a
+    391:391:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):207:207 -> a
     391:391:void lambda$rewriteSourceFile$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProgramClass):478 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     392:393:void encodeChecksums(java.lang.Iterable):245:246 -> a
@@ -15718,7 +15758,7 @@
     434:434:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):280 -> a
     435:444:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):420:429 -> a
     435:444:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):280 -> a
-    445:445:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):202:202 -> a
+    445:445:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):207:207 -> a
     445:445:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):430 -> a
     445:445:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):280 -> a
     446:454:com.android.tools.r8.utils.OriginalSourceFiles com.android.tools.r8.dex.ApplicationWriter.computeSourceFileString(com.android.tools.r8.utils.Box,java.util.List):434:442 -> a
@@ -15733,10 +15773,10 @@
     515:515:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):339 -> a
     516:518:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):342:344 -> a
     519:554:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):343:378 -> a
-    555:555:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    555:555:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     555:555:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):378 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    556:556:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    556:556:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     556:556:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):378 -> a
     557:566:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):378:387 -> a
     567:567:java.lang.Boolean lambda$write$0(java.util.List,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):308:308 -> a
@@ -15781,7 +15821,7 @@
     1379:1379:void insertAttributeAnnotations():659 -> a
     1380:1381:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):704:705 -> a
     1380:1381:void insertAttributeAnnotations():659 -> a
-    1382:1391: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):191:200 -> a
+    1382:1391: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):196:205 -> a
     1382:1391:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):703 -> a
     1382:1391:void insertAttributeAnnotations():659 -> a
     1392:1400:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):702:710 -> a
@@ -15816,58 +15856,71 @@
     1445:1453:void insertAttributeAnnotations():659 -> a
     1454:1454:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):738:738 -> a
     1454:1454:void insertAttributeAnnotations():659 -> a
-    1455:1465:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):737:747 -> a
-    1455:1465:void insertAttributeAnnotations():659 -> a
-    1466:1466:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71:71 -> a
-    1466:1466:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):745 -> a
-    1466:1466:void insertAttributeAnnotations():659 -> a
-    1467:1467:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
-    1467:1467:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71 -> a
-    1467:1467:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):745 -> a
-    1467:1467:void insertAttributeAnnotations():659 -> a
-    1468:1469:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:73 -> a
-    1468:1469:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):745 -> a
-    1468:1469:void insertAttributeAnnotations():659 -> a
-    1470:1480:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):745:755 -> a
-    1470:1480:void insertAttributeAnnotations():659 -> a
-    1481:1482:void insertAttributeAnnotations():660:661 -> a
-    1483:1492:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):759:768 -> a
-    1493:1493:com.android.tools.r8.naming.NamingLens com.android.tools.r8.dex.ApplicationWriter.getNamingLens():186:186 -> a
-    1493:1493:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):768 -> a
-    1494:1494:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):768:768 -> a
-    1495:1495:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
-    1495:1495:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):768 -> a
+    1455:1460:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):737:742 -> a
+    1455:1460:void insertAttributeAnnotations():659 -> a
+    1461:1461:boolean com.android.tools.r8.utils.InternalOptions.canUseSealedClasses():2010:2010 -> a
+    1461:1461:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):742 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1498:1501:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
-    1498:1501:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):768 -> a
-    1502:1502:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):768:768 -> a
-    1503:1503:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):767:767 -> a
-    1504:1504:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):765:765 -> a
-    1505:1505:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):764:764 -> a
-    1506:1513:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):763:770 -> a
-    1514:1523:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):774:783 -> a
-    1524:1524:com.android.tools.r8.naming.NamingLens com.android.tools.r8.dex.ApplicationWriter.getNamingLens():186:186 -> a
-    1524:1524:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):783 -> a
-    1525:1525:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):783:783 -> a
-    1526:1526:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:878 -> a
-    1526:1526:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):783 -> a
+    1461:1461:void insertAttributeAnnotations():659 -> a
+    1462:1462:boolean com.android.tools.r8.utils.InternalOptions.canUseSealedClasses():2010:2010 -> a
+    1462:1462:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):742 -> a
+    1462:1462:void insertAttributeAnnotations():659 -> a
+    1463:1463:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):745:745 -> a
+    1463:1463:void insertAttributeAnnotations():659 -> a
+    1464:1464:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):744:744 -> a
+    1464:1464:void insertAttributeAnnotations():659 -> a
+    1465:1475:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):743:753 -> a
+    1465:1475:void insertAttributeAnnotations():659 -> a
+    1476:1476:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71:71 -> a
+    1476:1476:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):751 -> a
+    1476:1476:void insertAttributeAnnotations():659 -> a
+    1477:1477:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Class,int):49:49 -> a
+    1477:1477:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):71 -> a
+    1477:1477:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):751 -> a
+    1477:1477:void insertAttributeAnnotations():659 -> a
+    1478:1479:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.concat(java.lang.Object[],java.lang.Object[],java.lang.Class):72:73 -> a
+    1478:1479:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):751 -> a
+    1478:1479:void insertAttributeAnnotations():659 -> a
+    1480:1491:void com.android.tools.r8.dex.ApplicationWriter.insertAttributeAnnotationsForClass(com.android.tools.r8.graph.DexProgramClass):751:762 -> a
+    1480:1491:void insertAttributeAnnotations():659 -> a
+    1492:1493:void insertAttributeAnnotations():660:661 -> a
+    1494:1503:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):766:775 -> a
+    1504:1504:com.android.tools.r8.naming.NamingLens com.android.tools.r8.dex.ApplicationWriter.getNamingLens():186:186 -> a
+    1504:1504:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):775 -> a
+    1505:1505:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):775:775 -> a
+    1506:1506:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
+    1506:1506:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):775 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1529:1532:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):881:884 -> a
-    1529:1532:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):783 -> a
-    1533:1533:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):783:783 -> a
-    1534:1534:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):782:782 -> a
-    1535:1535:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):780:780 -> a
-    1536:1536:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):779:779 -> a
-    1537:1544:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):778:785 -> a
-    1545:1545:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):794:794 -> a
-    1546:1546:void lambda$setCallSiteContexts$6(com.android.tools.r8.graph.ProgramMethod):796:796 -> a
-    1547:1559:void rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):811:823 -> a
-    1560:1567:void lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.ProgramMethod):826:833 -> a
-    1568:1573:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):843:848 -> a
-    1574:1574:void lambda$writeMainDexList$8(java.lang.StringBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):864:864 -> a
-    1575:1576:java.lang.String com.android.tools.r8.dex.ApplicationWriter.mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):852:853 -> a
-    1575:1576:void lambda$writeMainDexList$8(java.lang.StringBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):864 -> a
-    1577:1577:void lambda$writeMainDexList$8(java.lang.StringBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):864:864 -> a
+    1509:1512:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
+    1509:1512:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):775 -> a
+    1513:1513:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):775:775 -> a
+    1514:1514:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):774:774 -> a
+    1515:1515:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):772:772 -> a
+    1516:1516:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):771:771 -> a
+    1517:1524:void insertAttributeAnnotationsForField(com.android.tools.r8.graph.DexEncodedField):770:777 -> a
+    1525:1534:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):781:790 -> a
+    1535:1535:com.android.tools.r8.naming.NamingLens com.android.tools.r8.dex.ApplicationWriter.getNamingLens():186:186 -> a
+    1535:1535:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):790 -> a
+    1536:1536:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):790:790 -> a
+    1537:1537:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:878 -> a
+    1537:1537:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):790 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1540:1543:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):881:884 -> a
+    1540:1543:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):790 -> a
+    1544:1544:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):790:790 -> a
+    1545:1545:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):789:789 -> a
+    1546:1546:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):787:787 -> a
+    1547:1547:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):786:786 -> a
+    1548:1555:void insertAttributeAnnotationsForMethod(com.android.tools.r8.graph.DexEncodedMethod):785:792 -> a
+    1556:1556:void setCallSiteContexts(com.android.tools.r8.graph.DexProgramClass):801:801 -> a
+    1557:1557:void lambda$setCallSiteContexts$6(com.android.tools.r8.graph.ProgramMethod):803:803 -> a
+    1558:1570:void rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,java.util.Collection,com.android.tools.r8.graph.DexApplication):818:830 -> a
+    1571:1578:void lambda$rewriteCodeWithJumboStrings$7(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.ProgramMethod):833:840 -> a
+    1579:1584:com.android.tools.r8.dex.FileWriter$ByteBufferResult writeDexFile(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ByteBufferProvider,com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing):850:855 -> a
+    1585:1585:void lambda$writeMainDexList$8(java.lang.StringBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):871:871 -> a
+    1586:1587:java.lang.String com.android.tools.r8.dex.ApplicationWriter.mapMainDexListName(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):859:860 -> a
+    1586:1587:void lambda$writeMainDexList$8(java.lang.StringBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):871 -> a
+    1588:1588:void lambda$writeMainDexList$8(java.lang.StringBuilder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):871:871 -> a
     1:1:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":422,"2":423,"3":424}}
     422:422:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):363:363 -> b
@@ -15876,20 +15929,20 @@
     364:364:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):363:363 -> b
     365:379:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):498:512 -> b
     365:379:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):364 -> b
-    380:380:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():541:541 -> b
+    380:380:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():546:546 -> b
     380:380:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):512 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     380:380:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):364 -> b
-    381:381:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():541:541 -> b
+    381:381:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():546:546 -> b
     381:381:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):512 -> b
     381:381:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):364 -> b
     382:388:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):515:521 -> b
     382:388:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):364 -> b
-    389:389:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():537:537 -> b
+    389:389:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():542:542 -> b
     389:389:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):521 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     389:389:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):364 -> b
-    390:390:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():537:537 -> b
+    390:390:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():542:542 -> b
     390:390:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):521 -> b
     390:390:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):364 -> b
     391:407:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):526:542 -> b
@@ -15898,8 +15951,8 @@
     408:420:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):364 -> b
     421:421:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):365:365 -> b
     425:430:com.android.tools.r8.graph.DexString rewriteSourceFile(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):473:478 -> b
-    431:433:void setCallSiteContexts(java.util.concurrent.ExecutorService):789:789 -> b
-    434:441:java.lang.String writeMainDexList(com.android.tools.r8.graph.AppView):858:865 -> b
+    431:433:void setCallSiteContexts(java.util.concurrent.ExecutorService):796:796 -> b
+    434:441:java.lang.String writeMainDexList(com.android.tools.r8.graph.AppView):865:872 -> b
     1:1:void write(java.util.concurrent.ExecutorService):266:266 -> c
     2:2:boolean com.android.tools.r8.dex.ApplicationWriter.willComputeProguardMap():261:261 -> c
     2:2:void write(java.util.concurrent.ExecutorService):266 -> c
@@ -15944,9 +15997,9 @@
 com.android.tools.r8.dex.ApplicationWriter$LazyDexString -> com.android.tools.r8.internal.I2:
     boolean computed -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():868:868 -> <clinit>
-    1:2:void <init>():868:869 -> <init>
-    1:3:com.android.tools.r8.graph.DexString compute():874:876 -> a
+    1:1:void <clinit>():875:875 -> <clinit>
+    1:2:void <init>():875:876 -> <init>
+    1:3:com.android.tools.r8.graph.DexString compute():881:883 -> a
     com.android.tools.r8.graph.DexString internalCompute() -> b
 com.android.tools.r8.dex.ApplicationWriter$SortAnnotations -> com.android.tools.r8.internal.J2:
     com.android.tools.r8.naming.NamingLens namingLens -> a
@@ -15974,7 +16027,7 @@
     1:1:int getUleb128():44:44 -> d
     1:1:int getUleb128p1():52 -> d
     1:2:int getUshort():62:63 -> e
-com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.Db:
+com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.Gb:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap dictionary -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -15991,7 +16044,7 @@
     15:15:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonObject():55:55 -> b
     15:15:void tryParseAndAppend(com.android.tools.r8.graph.DexString):65 -> b
     16:16:void tryParseAndAppend(com.android.tools.r8.graph.DexString):66:66 -> b
-com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.internal.cc:
+com.android.tools.r8.dex.CodeToKeep -> com.android.tools.r8.internal.fc:
     1:1:void <init>():26:26 -> <init>
     void generateKeepRules(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isNop() -> a
@@ -16000,14 +16053,14 @@
     void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:5:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.graph.AppView):29:33 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     6:6:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.graph.AppView):34 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     7:7:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.graph.AppView):34 -> a
     8:12:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.graph.AppView):34:38 -> a
     13:13:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.graph.AppView):36:36 -> a
-com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.internal.ac:
+com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep -> com.android.tools.r8.internal.dc:
     java.util.Map toKeep -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):67:67 -> <init>
@@ -16057,13 +16110,13 @@
     101:101:boolean shouldKeep(com.android.tools.r8.graph.DexType):87 -> c
     102:104:boolean shouldKeep(com.android.tools.r8.graph.DexType):88:88 -> c
     107:107:boolean shouldKeep(com.android.tools.r8.graph.DexType):91:91 -> c
-com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$KeepStruct -> com.android.tools.r8.internal.Zb:
+com.android.tools.r8.dex.CodeToKeep$DesugaredLibraryCodeToKeep$KeepStruct -> com.android.tools.r8.internal.cc:
     java.util.Set fields -> a
     java.util.Set methods -> b
     boolean all -> c
     1:5:void <init>():57:61 -> <init>
     6:6:void <init>(com.android.tools.r8.dex.CodeToKeep$1):57:57 -> <init>
-com.android.tools.r8.dex.CodeToKeep$NopCodeToKeep -> com.android.tools.r8.internal.bc:
+com.android.tools.r8.dex.CodeToKeep$NopCodeToKeep -> com.android.tools.r8.internal.ec:
     1:1:void <init>():216:216 -> <init>
     boolean isNop() -> a
     void recordClass(com.android.tools.r8.graph.DexType) -> a
@@ -16071,7 +16124,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):240:240 -> a
-com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.Nc:
+com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.Qc:
     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
@@ -16139,12 +16192,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.ae:
+com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.de:
     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.bf:
+com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.ff:
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     java.nio.ByteBuffer buffer -> d
     com.android.tools.r8.graph.DexDebugInfoForWriting info -> c
@@ -16172,7 +16225,7 @@
     3:6:void com.android.tools.r8.dex.DebugBytecodeWriter.maybeGrow(int):36:39 -> c
     3:6:void putUleb128(int):56 -> c
     7:7:void putUleb128(int):57:57 -> c
-com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy -> com.android.tools.r8.internal.Af:
+com.android.tools.r8.dex.DefaultMixedSectionLayoutStrategy -> com.android.tools.r8.internal.Ef:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.dex.FileWriter$MixedSectionOffsets mixedSectionOffsets -> b
     boolean $assertionsDisabled -> c
@@ -16242,7 +16295,7 @@
     1:2:void forward(int):149:150 -> d
     1:2:void moveTo(int):158:159 -> e
     1:2:void putInt(int):125:126 -> f
-com.android.tools.r8.dex.DexOutputBuffer$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Hh:
+com.android.tools.r8.dex.DexOutputBuffer$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Lh:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:5:java.lang.StringBuilder com.android.tools.r8.dex.DexOutputBuffer$$InternalSyntheticOutline$166$2fa3327658a3747aa1eac19934d5e19eadcfd88a0fe905e3e2553d0deedbdab7$0.m(java.lang.String,int,java.lang.String):0:4 -> a
@@ -16263,684 +16316,684 @@
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> k
     com.android.tools.r8.utils.InternalOptions options -> f
-    1:1:void <clinit>():91:91 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.utils.InternalOptions):137:137 -> <init>
-    2:22:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.utils.InternalOptions):126:146 -> <init>
-    1:1:com.android.tools.r8.dex.DexSection[] parseMapFrom(java.nio.file.Path):103:103 -> a
-    2:2:com.android.tools.r8.dex.DexSection[] parseMapFrom(java.io.InputStream,com.android.tools.r8.origin.Origin):107:107 -> a
-    3:5:com.android.tools.r8.dex.DexSection[] parseMapFrom(com.android.tools.r8.dex.DexReader):111:113 -> a
-    3:5:com.android.tools.r8.dex.DexSection[] parseMapFrom(java.io.InputStream,com.android.tools.r8.origin.Origin):107 -> a
-    6:15:java.lang.Object cacheAt(int,java.util.function.Supplier):441:450 -> a
-    16:17:com.android.tools.r8.graph.DexAnnotation parseAnnotation():455:456 -> a
+    1:1:void <clinit>():93:93 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.utils.InternalOptions):139:139 -> <init>
+    2:22:void <init>(com.android.tools.r8.dex.DexReader,com.android.tools.r8.graph.ClassKind,com.android.tools.r8.utils.InternalOptions):128:148 -> <init>
+    1:1:com.android.tools.r8.dex.DexSection[] parseMapFrom(java.nio.file.Path):105:105 -> a
+    2:2:com.android.tools.r8.dex.DexSection[] parseMapFrom(java.io.InputStream,com.android.tools.r8.origin.Origin):109:109 -> a
+    3:5:com.android.tools.r8.dex.DexSection[] parseMapFrom(com.android.tools.r8.dex.DexReader):113:115 -> a
+    3:5:com.android.tools.r8.dex.DexSection[] parseMapFrom(java.io.InputStream,com.android.tools.r8.origin.Origin):109 -> a
+    6:15:java.lang.Object cacheAt(int,java.util.function.Supplier):443:452 -> a
+    16:17:com.android.tools.r8.graph.DexAnnotation parseAnnotation():457:458 -> a
     18:18:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    18:18:com.android.tools.r8.graph.DexAnnotation parseAnnotation():456 -> a
+    18:18:com.android.tools.r8.graph.DexAnnotation parseAnnotation():458 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:19:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    19:19:com.android.tools.r8.graph.DexAnnotation parseAnnotation():456 -> a
+    19:19:com.android.tools.r8.graph.DexAnnotation parseAnnotation():458 -> a
     20:20:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    20:20:com.android.tools.r8.graph.DexAnnotation parseAnnotation():456 -> a
-    21:21:com.android.tools.r8.graph.DexAnnotation parseAnnotation():458:458 -> a
+    20:20:com.android.tools.r8.graph.DexAnnotation parseAnnotation():458 -> a
+    21:21:com.android.tools.r8.graph.DexAnnotation parseAnnotation():460:460 -> a
     22:22:byte com.android.tools.r8.dex.BinaryReader.get():97:97 -> a
-    22:22:com.android.tools.r8.graph.DexAnnotation parseAnnotation():458 -> a
+    22:22:com.android.tools.r8.graph.DexAnnotation parseAnnotation():460 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     23:23:byte com.android.tools.r8.dex.BinaryReader.get():97:97 -> a
-    23:23:com.android.tools.r8.graph.DexAnnotation parseAnnotation():458 -> a
-    24:24:com.android.tools.r8.graph.DexAnnotation parseAnnotation():459:459 -> a
-    25:25:com.android.tools.r8.graph.DexAnnotation annotationAt(int):463:463 -> a
-    26:31:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):664:669 -> a
+    23:23:com.android.tools.r8.graph.DexAnnotation parseAnnotation():460 -> a
+    24:24:com.android.tools.r8.graph.DexAnnotation parseAnnotation():461:461 -> a
+    25:25:com.android.tools.r8.graph.DexAnnotation annotationAt(int):465:465 -> a
+    26:31:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):666:671 -> a
     32:32:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    32:32:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):669 -> a
-    33:34:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):670:671 -> a
+    32:32:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):671 -> a
+    33:34:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):672:673 -> a
     35:35:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    35:35:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):671 -> a
-    36:46:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):671:681 -> a
-    47:48:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):335:336 -> a
-    47:48:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):681 -> a
-    49:52:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):683:686 -> a
-    53:63:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):685:695 -> a
+    35:35:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):673 -> a
+    36:46:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):673:683 -> a
+    47:48:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):362:363 -> a
+    47:48:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):683 -> a
+    49:52:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):685:688 -> a
+    53:63:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):687:697 -> a
     64:64:com.android.tools.r8.graph.DexEncodedField$Builder com.android.tools.r8.graph.DexEncodedField$Builder.disableAndroidApiLevelCheck():498:498 -> a
-    64:64:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):696 -> a
-    65:65:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):697:697 -> a
-    66:73:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):707:714 -> a
+    64:64:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):698 -> a
+    65:65:com.android.tools.r8.graph.DexEncodedField[] readFields(int,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexValue[]):699:699 -> a
+    66:73:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):709:716 -> a
     74:74:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    74:74:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):714 -> a
-    75:75:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):715:715 -> a
+    74:74:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):716 -> a
+    75:75:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):717:717 -> a
     76:76:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    76:76:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):715 -> a
-    77:78:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):715:716 -> a
+    76:76:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):717 -> a
+    77:78:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):717:718 -> a
     79:79:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    79:79:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):716 -> a
-    80:81:void ensureCodesInited(int):154:155 -> a
-    80:81:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    79:79:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):718 -> a
+    80:81:void ensureCodesInited(int):156:157 -> a
+    80:81:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     82:82:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():119:119 -> a
-    82:82:void ensureCodesInited(int):155 -> a
-    82:82:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    83:96:void ensureCodesInited(int):155:168 -> a
-    83:96:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    82:82:void ensureCodesInited(int):157 -> a
+    82:82:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    83:96:void ensureCodesInited(int):157:170 -> a
+    83:96:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     97:97:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    97:97:void ensureCodesInited(int):168 -> a
+    97:97:void ensureCodesInited(int):170 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    97:97:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    97:97:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     98:98:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    98:98:void ensureCodesInited(int):168 -> a
-    98:98:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    99:100:void ensureCodesInited(int):169:170 -> a
-    99:100:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    98:98:void ensureCodesInited(int):170 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    99:100:void ensureCodesInited(int):171:172 -> a
+    99:100:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     101:104:void com.android.tools.r8.dex.BinaryReader.align(int):90:93 -> a
-    101:104:void ensureCodesInited(int):170 -> a
-    101:104:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    105:117:com.android.tools.r8.graph.DexCode parseCodeItem():946:958 -> a
-    105:117:void ensureCodesInited(int):171 -> a
-    105:117:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    101:104:void ensureCodesInited(int):172 -> a
+    101:104:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    105:117:com.android.tools.r8.graph.DexCode parseCodeItem():949:961 -> a
+    105:117:void ensureCodesInited(int):173 -> a
+    105:117:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     118:118:short com.android.tools.r8.dex.BinaryReader.getShort():68:68 -> a
-    118:118:com.android.tools.r8.graph.DexCode parseCodeItem():958 -> a
+    118:118:com.android.tools.r8.graph.DexCode parseCodeItem():961 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    118:118:void ensureCodesInited(int):171 -> a
-    118:118:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    118:118:void ensureCodesInited(int):173 -> a
+    118:118:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     119:119:short com.android.tools.r8.dex.BinaryReader.getShort():68:68 -> a
-    119:119:com.android.tools.r8.graph.DexCode parseCodeItem():958 -> a
-    119:119:void ensureCodesInited(int):171 -> a
-    119:119:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    120:135:com.android.tools.r8.graph.DexCode parseCodeItem():958:973 -> a
-    120:135:void ensureCodesInited(int):171 -> a
-    120:135:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    119:119:com.android.tools.r8.graph.DexCode parseCodeItem():961 -> a
+    119:119:void ensureCodesInited(int):173 -> a
+    119:119:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    120:135:com.android.tools.r8.graph.DexCode parseCodeItem():961:976 -> a
+    120:135:void ensureCodesInited(int):173 -> a
+    120:135:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     136:136:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    136:136:com.android.tools.r8.graph.DexCode parseCodeItem():973 -> a
+    136:136:com.android.tools.r8.graph.DexCode parseCodeItem():976 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    136:136:void ensureCodesInited(int):171 -> a
-    136:136:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    136:136:void ensureCodesInited(int):173 -> a
+    136:136:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     137:137:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    137:137:com.android.tools.r8.graph.DexCode parseCodeItem():973 -> a
-    137:137:void ensureCodesInited(int):171 -> a
-    137:137:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    138:138:com.android.tools.r8.graph.DexCode parseCodeItem():975:975 -> a
-    138:138:void ensureCodesInited(int):171 -> a
-    138:138:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    137:137:com.android.tools.r8.graph.DexCode parseCodeItem():976 -> a
+    137:137:void ensureCodesInited(int):173 -> a
+    137:137:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    138:138:com.android.tools.r8.graph.DexCode parseCodeItem():978:978 -> a
+    138:138:void ensureCodesInited(int):173 -> a
+    138:138:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     139:139:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    139:139:com.android.tools.r8.graph.DexCode parseCodeItem():975 -> a
-    139:139:void ensureCodesInited(int):171 -> a
-    139:139:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    140:144:com.android.tools.r8.graph.DexCode parseCodeItem():976:980 -> a
-    140:144:void ensureCodesInited(int):171 -> a
-    140:144:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    139:139:com.android.tools.r8.graph.DexCode parseCodeItem():978 -> a
+    139:139:void ensureCodesInited(int):173 -> a
+    139:139:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    140:144:com.android.tools.r8.graph.DexCode parseCodeItem():979:983 -> a
+    140:144:void ensureCodesInited(int):173 -> a
+    140:144:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     145:145:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    145:145:com.android.tools.r8.graph.DexCode parseCodeItem():980 -> a
+    145:145:com.android.tools.r8.graph.DexCode parseCodeItem():983 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    145:145:void ensureCodesInited(int):171 -> a
-    145:145:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    145:145:void ensureCodesInited(int):173 -> a
+    145:145:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     146:146:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    146:146:com.android.tools.r8.graph.DexCode parseCodeItem():980 -> a
-    146:146:void ensureCodesInited(int):171 -> a
-    146:146:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    147:149:com.android.tools.r8.graph.DexCode parseCodeItem():981:983 -> a
-    147:149:void ensureCodesInited(int):171 -> a
-    147:149:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    146:146:com.android.tools.r8.graph.DexCode parseCodeItem():983 -> a
+    146:146:void ensureCodesInited(int):173 -> a
+    146:146:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    147:149:com.android.tools.r8.graph.DexCode parseCodeItem():984:986 -> a
+    147:149:void ensureCodesInited(int):173 -> a
+    147:149:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     150:150:int com.android.tools.r8.dex.BinaryReader.getSleb128():48:48 -> a
-    150:150:com.android.tools.r8.graph.DexCode parseCodeItem():983 -> a
-    150:150:void ensureCodesInited(int):171 -> a
-    150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    151:155:com.android.tools.r8.graph.DexCode parseCodeItem():984:988 -> a
-    151:155:void ensureCodesInited(int):171 -> a
-    151:155:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    150:150:com.android.tools.r8.graph.DexCode parseCodeItem():986 -> a
+    150:150:void ensureCodesInited(int):173 -> a
+    150:150:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    151:155:com.android.tools.r8.graph.DexCode parseCodeItem():987:991 -> a
+    151:155:void ensureCodesInited(int):173 -> a
+    151:155:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     156:156:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    156:156:com.android.tools.r8.graph.DexCode parseCodeItem():988 -> a
-    156:156:void ensureCodesInited(int):171 -> a
-    156:156:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    157:157:com.android.tools.r8.graph.DexCode parseCodeItem():989:989 -> a
-    157:157:void ensureCodesInited(int):171 -> a
-    157:157:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    156:156:com.android.tools.r8.graph.DexCode parseCodeItem():991 -> a
+    156:156:void ensureCodesInited(int):173 -> a
+    156:156:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    157:157:com.android.tools.r8.graph.DexCode parseCodeItem():992:992 -> a
+    157:157:void ensureCodesInited(int):173 -> a
+    157:157:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     158:158:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    158:158:com.android.tools.r8.graph.DexCode parseCodeItem():989 -> a
-    158:158:void ensureCodesInited(int):171 -> a
-    158:158:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    159:163:com.android.tools.r8.graph.DexCode parseCodeItem():990:994 -> a
-    159:163:void ensureCodesInited(int):171 -> a
-    159:163:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    158:158:com.android.tools.r8.graph.DexCode parseCodeItem():992 -> a
+    158:158:void ensureCodesInited(int):173 -> a
+    158:158:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    159:163:com.android.tools.r8.graph.DexCode parseCodeItem():993:997 -> a
+    159:163:void ensureCodesInited(int):173 -> a
+    159:163:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     164:164:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    164:164:com.android.tools.r8.graph.DexCode parseCodeItem():994 -> a
-    164:164:void ensureCodesInited(int):171 -> a
-    164:164:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    165:168:com.android.tools.r8.graph.DexCode parseCodeItem():996:999 -> a
-    165:168:void ensureCodesInited(int):171 -> a
-    165:168:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    164:164:com.android.tools.r8.graph.DexCode parseCodeItem():997 -> a
+    164:164:void ensureCodesInited(int):173 -> a
+    164:164:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    165:168:com.android.tools.r8.graph.DexCode parseCodeItem():999:1002 -> a
+    165:168:void ensureCodesInited(int):173 -> a
+    165:168:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     169:169:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):749:749 -> a
-    169:169:com.android.tools.r8.graph.DexCode parseCodeItem():1000 -> a
+    169:169:com.android.tools.r8.graph.DexCode parseCodeItem():1003 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    169:169:void ensureCodesInited(int):171 -> a
-    169:169:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    169:169:void ensureCodesInited(int):173 -> a
+    169:169:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     170:170:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):749:749 -> a
-    170:170:com.android.tools.r8.graph.DexCode parseCodeItem():1000 -> a
-    170:170:void ensureCodesInited(int):171 -> a
-    170:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    171:171:com.android.tools.r8.graph.DexCode parseCodeItem():1005:1005 -> a
-    171:171:void ensureCodesInited(int):171 -> a
-    171:171:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    170:170:com.android.tools.r8.graph.DexCode parseCodeItem():1003 -> a
+    170:170:void ensureCodesInited(int):173 -> a
+    170:170:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    171:171:com.android.tools.r8.graph.DexCode parseCodeItem():1008:1008 -> a
+    171:171:void ensureCodesInited(int):173 -> a
+    171:171:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     172:172:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    172:172:com.android.tools.r8.graph.DexCode parseCodeItem():1005 -> a
+    172:172:com.android.tools.r8.graph.DexCode parseCodeItem():1008 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    172:172:void ensureCodesInited(int):171 -> a
-    172:172:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
+    172:172:void ensureCodesInited(int):173 -> a
+    172:172:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
     173:173:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    173:173:com.android.tools.r8.graph.DexCode parseCodeItem():1005 -> a
-    173:173:void ensureCodesInited(int):171 -> a
-    173:173:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    174:179:com.android.tools.r8.graph.DexCode parseCodeItem():1006:1011 -> a
-    174:179:void ensureCodesInited(int):171 -> a
-    174:179:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    180:181:void ensureCodesInited(int):172:173 -> a
-    180:181:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):719 -> a
-    182:190:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):720:728 -> a
-    191:192:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):335:336 -> a
-    191:192:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):728 -> a
-    193:196:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):730:733 -> a
-    197:214:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):732:749 -> a
-    215:234:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):755:774 -> a
+    173:173:com.android.tools.r8.graph.DexCode parseCodeItem():1008 -> a
+    173:173:void ensureCodesInited(int):173 -> a
+    173:173:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    174:179:com.android.tools.r8.graph.DexCode parseCodeItem():1009:1014 -> a
+    174:179:void ensureCodesInited(int):173 -> a
+    174:179:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    180:181:void ensureCodesInited(int):174:175 -> a
+    180:181:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):721 -> a
+    182:190:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):722:730 -> a
+    191:192:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):362:363 -> a
+    191:192:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):730 -> a
+    193:196:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):732:735 -> a
+    197:214:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):734:751 -> a
+    215:234:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):757:776 -> a
     235:235:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    235:235:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):774 -> a
+    235:235:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):776 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     236:236:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    236:236:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):774 -> a
+    236:236:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):776 -> a
     237:237:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    237:237:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):774 -> a
-    238:240:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):776:778 -> a
+    237:237:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):776 -> a
+    238:240:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):778:780 -> a
     241:241:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    241:241:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):778 -> a
+    241:241:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):780 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     242:242:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    242:242:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):778 -> a
-    243:245:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):778:780 -> a
+    242:242:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):780 -> a
+    243:245:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):780:782 -> a
     246:246:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    246:246:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):780 -> a
+    246:246:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):782 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     247:247:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    247:247:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):780 -> a
-    248:287:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):780:819 -> a
+    247:247:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):782 -> a
+    248:287:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):782:821 -> a
     288:288:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    288:288:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):819 -> a
-    289:289:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):820:820 -> a
+    288:288:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):821 -> a
+    289:289:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):822:822 -> a
     290:290:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    290:290:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):820 -> a
-    291:291:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):821:821 -> a
+    290:290:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):822 -> a
+    291:291:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):823:823 -> a
     292:292:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    292:292:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):821 -> a
-    293:293:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):822:822 -> a
+    292:292:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):823 -> a
+    293:293:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):824:824 -> a
     294:294:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> a
-    294:294:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):822 -> a
-    295:299:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):824:828 -> a
-    300:345:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):825:870 -> a
-    346:367:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):852:873 -> a
-    368:368:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):796:796 -> a
-    369:369:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1169,"2":1170,"3":1171}}
-    1169:1169:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):796:796 -> a
-    1170:1170:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):796:796 -> a
-    1171:1171:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):796:796 -> a
-    1166:1166:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):797:797 -> a
-    1167:1167:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    1167:1167:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    1167:1167:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):797 -> a
-    1168:1168:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):797:797 -> a
-    1172:1172:long lambda$addClassDefsTo$0(java.lang.Long,com.android.tools.r8.graph.DexProgramClass):849:849 -> a
-    1:2:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():467:468 -> b
+    294:294:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):824 -> a
+    295:299:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):826:830 -> a
+    300:346:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):827:873 -> a
+    347:369:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):854:876 -> a
+    370:370:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):798:798 -> a
+    371:371:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1173,"2":1174,"3":1175}}
+    1173:1173:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):798:798 -> a
+    1174:1174:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):798:798 -> a
+    1175:1175:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):798:798 -> a
+    1170:1170:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):799:799 -> a
+    1171:1171:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    1171:1171:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    1171:1171:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):799 -> a
+    1172:1172:void addClassDefsTo(java.util.function.Consumer,com.android.tools.r8.graph.ApplicationReaderMap):799:799 -> a
+    1176:1176:long lambda$addClassDefsTo$0(java.lang.Long,com.android.tools.r8.graph.DexProgramClass):851:851 -> a
+    1:2:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():469:470 -> b
     3:3:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> b
-    3:3:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():468 -> b
+    3:3:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():470 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> b
-    4:4:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():468 -> b
+    4:4:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():470 -> b
     5:5:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    5:5:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():468 -> b
-    6:14:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():470:478 -> b
-    15:16:boolean retainAnnotation(com.android.tools.r8.graph.DexAnnotation):496:497 -> b
-    15:16:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():479 -> b
-    17:25:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():480:488 -> b
+    5:5:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():470 -> b
+    6:14:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():472:480 -> b
+    15:16:boolean retainAnnotation(com.android.tools.r8.graph.DexAnnotation):498:499 -> b
+    15:16:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():481 -> b
+    17:25:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():482:490 -> b
     26:26:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexAnnotationSet.findDuplicateEntryType(com.android.tools.r8.graph.DexAnnotation[]):78:78 -> b
-    26:26:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():488 -> b
+    26:26:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490 -> b
     27:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexAnnotationSet.findDuplicateEntryType(java.util.List):82:85 -> b
     27:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexAnnotationSet.findDuplicateEntryType(com.android.tools.r8.graph.DexAnnotation[]):78 -> b
-    27:30:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():488 -> b
-    31:31:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492:492 -> b
-    32:32:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490:490 -> b
+    27:30:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490 -> b
+    31:31:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():494:494 -> b
+    32:32:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492:492 -> b
     33:33:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":38,"2":39,"3":40}}
-    38:38:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490:490 -> b
-    39:39:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490:490 -> b
-    40:40:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490:490 -> b
+    38:38:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492:492 -> b
+    39:39:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492:492 -> b
+    40:40:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492:492 -> b
     34:34:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41,"2":42,"3":43,"4":44}}
-    41:41:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490:490 -> b
-    42:42:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490:490 -> b
-    43:43:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490:490 -> b
-    44:44:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490:490 -> b
+    41:41:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492:492 -> b
+    42:42:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492:492 -> b
+    43:43:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492:492 -> b
+    44:44:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492:492 -> b
     35:35:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    35:35:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490 -> b
+    35:35:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492 -> b
     36:36:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> b
     36:36:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> b
-    36:36:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490 -> b
-    37:37:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():490:490 -> b
-    45:45:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):501:501 -> b
-    46:48:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):432:434 -> b
-    46:48:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):501 -> b
-    49:49:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):501:501 -> b
-    1:1:com.android.tools.r8.graph.ParameterAnnotationsList annotationSetRefListAt(int):390:390 -> c
-    2:9:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():394:401 -> c
+    36:36:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492 -> b
+    37:37:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():492:492 -> b
+    45:45:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):503:503 -> b
+    46:48:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):434:436 -> b
+    46:48:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):503 -> b
+    49:49:com.android.tools.r8.graph.DexAnnotationSet annotationSetAt(int):503:503 -> b
+    1:1:com.android.tools.r8.graph.ParameterAnnotationsList annotationSetRefListAt(int):392:392 -> c
+    2:9:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():396:403 -> c
     10:10:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.ParameterAnnotationsList.create(com.android.tools.r8.graph.DexAnnotationSet[]):72:72 -> c
-    10:10:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():403 -> c
-    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):505:505 -> d
-    2:4:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):432:434 -> d
-    2:4:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):506 -> d
-    5:5:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):506:506 -> d
-    6:9:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():510:513 -> d
-    10:16:com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] parseFieldAnnotations(int):351:357 -> d
-    10:16:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():514 -> d
+    10:10:com.android.tools.r8.graph.ParameterAnnotationsList parseAnnotationSetRefList():405 -> c
+    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):507:507 -> d
+    2:4:java.lang.Object cacheAt(int,java.util.function.Supplier,java.util.function.Supplier):434:436 -> d
+    2:4:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):508 -> d
+    5:5:com.android.tools.r8.dex.DexParser$AnnotationsDirectory annotationsDirectoryAt(int):508:508 -> d
+    6:9:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():512:515 -> d
+    10:16:com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] parseFieldAnnotations(int):353:359 -> d
+    10:16:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():516 -> d
     17:17:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> d
-    17:17:com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] parseFieldAnnotations(int):357 -> d
+    17:17:com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] parseFieldAnnotations(int):359 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    17:17:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():514 -> d
+    17:17:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():516 -> d
     18:18:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> d
-    18:18:com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] parseFieldAnnotations(int):357 -> d
-    18:18:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():514 -> d
-    19:25:com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] parseFieldAnnotations(int):358:364 -> d
-    19:25:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():514 -> d
-    26:32:com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] parseMethodAnnotations(int):372:378 -> d
-    26:32:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():515 -> d
+    18:18:com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] parseFieldAnnotations(int):359 -> d
+    18:18:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():516 -> d
+    19:25:com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] parseFieldAnnotations(int):360:366 -> d
+    19:25:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():516 -> d
+    26:32:com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] parseMethodAnnotations(int):374:380 -> d
+    26:32:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():517 -> d
     33:33:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> d
-    33:33:com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] parseMethodAnnotations(int):378 -> d
+    33:33:com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] parseMethodAnnotations(int):380 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:33:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():515 -> d
+    33:33:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():517 -> d
     34:34:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> d
-    34:34:com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] parseMethodAnnotations(int):378 -> d
-    34:34:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():515 -> d
-    35:41:com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] parseMethodAnnotations(int):379:385 -> d
-    35:41:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():515 -> d
-    42:48:com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parseParameterAnnotations(int):410:416 -> d
-    42:48:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():516 -> d
+    34:34:com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] parseMethodAnnotations(int):380 -> d
+    34:34:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():517 -> d
+    35:41:com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] parseMethodAnnotations(int):381:387 -> d
+    35:41:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():517 -> d
+    42:48:com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parseParameterAnnotations(int):412:418 -> d
+    42:48:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():518 -> d
     49:49:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> d
-    49:49:com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parseParameterAnnotations(int):416 -> d
+    49:49:com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parseParameterAnnotations(int):418 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    49:49:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():516 -> d
+    49:49:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():518 -> d
     50:50:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> d
-    50:50:com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parseParameterAnnotations(int):416 -> d
-    50:50:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():516 -> d
-    51:60:com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parseParameterAnnotations(int):417:426 -> d
-    51:60:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():516 -> d
-    61:62:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():517:518 -> d
-    1:1:com.android.tools.r8.graph.DexDebugInfo debugInfoAt(int):522:522 -> e
-    2:2:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():526:526 -> e
+    50:50:com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parseParameterAnnotations(int):418 -> d
+    50:50:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():518 -> d
+    51:60:com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parseParameterAnnotations(int):419:428 -> d
+    51:60:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():518 -> d
+    61:62:com.android.tools.r8.dex.DexParser$AnnotationsDirectory parseAnnotationsDirectory():519:520 -> d
+    1:1:com.android.tools.r8.graph.DexDebugInfo debugInfoAt(int):524:524 -> e
+    2:2:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():528:528 -> e
     3:3:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> e
-    3:3:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():526 -> e
-    4:4:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():528:528 -> e
+    3:3:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():528 -> e
+    4:4:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():530:530 -> e
     5:5:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> e
-    5:5:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():528 -> e
-    6:15:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():529:538 -> e
+    5:5:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():530 -> e
+    6:15:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():531:540 -> e
     16:16:int com.android.tools.r8.dex.BinaryReader.getUbyte():101:101 -> e
-    16:16:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():538 -> e
+    16:16:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():540 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     17:18:int com.android.tools.r8.dex.BinaryReader.getUbyte():101:102 -> e
-    17:18:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():538 -> e
-    19:19:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():615:615 -> e
-    20:23:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():605:608 -> e
-    24:24:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():599:599 -> e
-    25:25:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():593:593 -> e
-    26:26:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():587:587 -> e
+    17:18:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():540 -> e
+    19:19:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():617:617 -> e
+    20:23:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():607:610 -> e
+    24:24:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():601:601 -> e
+    25:25:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():595:595 -> e
+    26:26:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():589:589 -> e
     27:27:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> e
-    27:27:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():587 -> e
-    28:28:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():587:587 -> e
-    29:29:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():581:581 -> e
+    27:27:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():589 -> e
+    28:28:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():589:589 -> e
+    29:29:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():583:583 -> e
     30:30:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> e
-    30:30:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():581 -> e
-    31:31:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():581:581 -> e
-    32:32:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():566:566 -> e
+    30:30:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():583 -> e
+    31:31:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():583:583 -> e
+    32:32:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():568:568 -> e
     33:33:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> e
-    33:33:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():566 -> e
-    34:42:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():567:575 -> e
-    43:43:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():570:570 -> e
-    44:44:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():552:552 -> e
+    33:33:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():568 -> e
+    34:42:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():569:577 -> e
+    43:43:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():572:572 -> e
+    44:44:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():554:554 -> e
     45:45:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> e
-    45:45:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():552 -> e
-    46:52:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():553:559 -> e
-    53:53:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():555:555 -> e
-    54:54:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():547:547 -> e
+    45:45:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():554 -> e
+    46:52:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():555:561 -> e
+    53:53:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():557:557 -> e
+    54:54:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():549:549 -> e
     55:55:int com.android.tools.r8.dex.BinaryReader.getSleb128():48:48 -> e
-    55:55:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():547 -> e
-    56:56:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():547:547 -> e
-    57:57:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():543:543 -> e
+    55:55:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():549 -> e
+    56:56:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():549:549 -> e
+    57:57:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():545:545 -> e
     58:58:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> e
-    58:58:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():543 -> e
-    59:138:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():543:622 -> e
-    139:139:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():540:540 -> e
+    58:58:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():545 -> e
+    59:138:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():545:624 -> e
+    139:139:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():542:542 -> e
     140:140:int com.android.tools.r8.dex.BinaryReader.getUbyte():101:101 -> e
-    140:140:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():540 -> e
+    140:140:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():542 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     141:142:int com.android.tools.r8.dex.BinaryReader.getUbyte():101:102 -> e
-    141:142:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():540 -> e
-    143:144:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():629:630 -> e
-    1:1:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():319:319 -> f
+    141:142:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():542 -> e
+    143:144:com.android.tools.r8.graph.DexDebugInfo parseDebugInfo():631:632 -> e
+    1:1:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():321:321 -> f
     2:2:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> f
-    2:2:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():319 -> f
-    3:3:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():320:320 -> f
+    2:2:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():321 -> f
+    3:3:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():322:322 -> f
     4:4:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> f
-    4:4:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():320 -> f
-    5:7:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():321:323 -> f
+    4:4:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():322 -> f
+    5:7:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():323:325 -> f
     8:8:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> f
-    8:8:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():323 -> f
-    9:12:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():324:327 -> f
-    13:13:com.android.tools.r8.graph.DexEncodedArray encodedArrayAt(int):344:344 -> f
-    1:1:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():340:340 -> g
-    2:2:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():331:331 -> g
-    2:2:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():340 -> g
+    8:8:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():325 -> f
+    9:12:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():326:329 -> f
+    13:13:com.android.tools.r8.graph.DexEncodedArray encodedArrayAt(int):346:346 -> f
+    1:1:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():342:342 -> g
+    2:2:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():333:333 -> g
+    2:2:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():342 -> g
     3:3:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> g
-    3:3:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():331 -> g
-    3:3:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():340 -> g
-    4:6:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():332:334 -> g
-    4:6:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():340 -> g
-    7:7:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():340:340 -> g
-    8:14:com.android.tools.r8.dex.DexSection lookupSection(int):890:896 -> g
-    1:3:com.android.tools.r8.graph.DexTypeList typeListAt(int):187:189 -> h
-    4:4:com.android.tools.r8.graph.DexValue parseEncodedValue():193:193 -> h
+    3:3:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():333 -> g
+    3:3:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():342 -> g
+    4:6:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():334:336 -> g
+    4:6:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():342 -> g
+    7:7:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():342:342 -> g
+    8:14:com.android.tools.r8.dex.DexSection lookupSection(int):893:899 -> g
+    1:3:com.android.tools.r8.graph.DexTypeList typeListAt(int):189:191 -> h
+    4:4:com.android.tools.r8.graph.DexValue parseEncodedValue():195:195 -> h
     5:5:byte com.android.tools.r8.dex.BinaryReader.get():97:97 -> h
-    5:5:com.android.tools.r8.graph.DexValue parseEncodedValue():193 -> h
+    5:5:com.android.tools.r8.graph.DexValue parseEncodedValue():195 -> h
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:byte com.android.tools.r8.dex.BinaryReader.get():97:97 -> h
-    6:6:com.android.tools.r8.graph.DexValue parseEncodedValue():193 -> h
+    6:6:com.android.tools.r8.graph.DexValue parseEncodedValue():195 -> h
     7:7:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):93:93 -> h
-    7:7:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    7:7:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     8:8:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):91:91 -> h
-    8:8:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    8:8:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     9:9:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):89:89 -> h
-    9:9:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    9:9:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     10:10:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):87:87 -> h
-    10:10:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    10:10:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     11:11:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):85:85 -> h
-    11:11:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    11:11:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     12:12:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):83:83 -> h
-    12:12:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    12:12:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     13:13:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):81:81 -> h
-    13:13:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    13:13:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     14:14:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):79:79 -> h
-    14:14:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    14:14:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     15:15:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):77:77 -> h
-    15:15:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    15:15:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     16:16:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):75:75 -> h
-    16:16:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    16:16:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     17:17:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):73:73 -> h
-    17:17:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
-    18:18:com.android.tools.r8.graph.DexValue parseEncodedValue():196:196 -> h
+    17:17:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
+    18:18:com.android.tools.r8.graph.DexValue parseEncodedValue():198:198 -> h
     19:19:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):95:95 -> h
-    19:19:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    19:19:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     20:20:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):71:71 -> h
-    20:20:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    20:20:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     21:21:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):69:69 -> h
-    21:21:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    21:21:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     22:22:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):65:65 -> h
-    22:22:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    22:22:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     23:23:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):63:63 -> h
-    23:23:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    23:23:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     24:30:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):61:67 -> h
-    24:30:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
+    24:30:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
     31:31:com.android.tools.r8.graph.DexValue$DexValueKind com.android.tools.r8.graph.DexValue$DexValueKind.fromId(int):59:59 -> h
-    31:31:com.android.tools.r8.graph.DexValue parseEncodedValue():196 -> h
-    32:140:com.android.tools.r8.graph.DexValue parseEncodedValue():196:304 -> h
-    141:141:com.android.tools.r8.graph.DexValue parseEncodedValue():288:288 -> h
-    142:143:com.android.tools.r8.graph.DexValue parseEncodedValue():282:283 -> h
-    144:145:com.android.tools.r8.graph.DexValue parseEncodedValue():277:278 -> h
-    146:147:com.android.tools.r8.graph.DexValue parseEncodedValue():272:273 -> h
-    148:148:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():331:331 -> h
-    148:148:com.android.tools.r8.graph.DexValue parseEncodedValue():273 -> h
+    31:31:com.android.tools.r8.graph.DexValue parseEncodedValue():198 -> h
+    32:140:com.android.tools.r8.graph.DexValue parseEncodedValue():198:306 -> h
+    141:141:com.android.tools.r8.graph.DexValue parseEncodedValue():290:290 -> h
+    142:143:com.android.tools.r8.graph.DexValue parseEncodedValue():284:285 -> h
+    144:145:com.android.tools.r8.graph.DexValue parseEncodedValue():279:280 -> h
+    146:147:com.android.tools.r8.graph.DexValue parseEncodedValue():274:275 -> h
+    148:148:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():333:333 -> h
+    148:148:com.android.tools.r8.graph.DexValue parseEncodedValue():275 -> h
     149:149:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> h
-    149:149:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():331 -> h
-    149:149:com.android.tools.r8.graph.DexValue parseEncodedValue():273 -> h
-    150:152:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():332:334 -> h
-    150:152:com.android.tools.r8.graph.DexValue parseEncodedValue():273 -> h
-    153:153:com.android.tools.r8.graph.DexValue parseEncodedValue():273:273 -> h
-    154:155:com.android.tools.r8.graph.DexValue parseEncodedValue():267:268 -> h
-    156:157:com.android.tools.r8.graph.DexValue parseEncodedValue():260:261 -> h
-    158:160:void checkName(com.android.tools.r8.graph.DexString):309:311 -> h
-    158:160:com.android.tools.r8.graph.DexValue parseEncodedValue():261 -> h
+    149:149:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():333 -> h
+    149:149:com.android.tools.r8.graph.DexValue parseEncodedValue():275 -> h
+    150:152:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():334:336 -> h
+    150:152:com.android.tools.r8.graph.DexValue parseEncodedValue():275 -> h
+    153:153:com.android.tools.r8.graph.DexValue parseEncodedValue():275:275 -> h
+    154:155:com.android.tools.r8.graph.DexValue parseEncodedValue():269:270 -> h
+    156:157:com.android.tools.r8.graph.DexValue parseEncodedValue():262:263 -> h
+    158:160:void checkName(com.android.tools.r8.graph.DexString):311:313 -> h
+    158:160:com.android.tools.r8.graph.DexValue parseEncodedValue():263 -> h
     161:161:com.android.tools.r8.graph.DexValue parseEncodedValue():0:0 -> h
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":255,"2":256,"3":257}}
-    255:255:void checkName(com.android.tools.r8.graph.DexString):311:311 -> h
-    255:255:com.android.tools.r8.graph.DexValue parseEncodedValue():261 -> h
-    256:256:void checkName(com.android.tools.r8.graph.DexString):311:311 -> h
-    256:256:com.android.tools.r8.graph.DexValue parseEncodedValue():261 -> h
-    257:257:void checkName(com.android.tools.r8.graph.DexString):311:311 -> h
-    257:257:com.android.tools.r8.graph.DexValue parseEncodedValue():261 -> h
-    162:162:void checkName(com.android.tools.r8.graph.DexString):313:313 -> h
-    162:162:com.android.tools.r8.graph.DexValue parseEncodedValue():261 -> h
+    255:255:void checkName(com.android.tools.r8.graph.DexString):313:313 -> h
+    255:255:com.android.tools.r8.graph.DexValue parseEncodedValue():263 -> h
+    256:256:void checkName(com.android.tools.r8.graph.DexString):313:313 -> h
+    256:256:com.android.tools.r8.graph.DexValue parseEncodedValue():263 -> h
+    257:257:void checkName(com.android.tools.r8.graph.DexString):313:313 -> h
+    257:257:com.android.tools.r8.graph.DexValue parseEncodedValue():263 -> h
+    162:162:void checkName(com.android.tools.r8.graph.DexString):315:315 -> h
+    162:162:com.android.tools.r8.graph.DexValue parseEncodedValue():263 -> h
     163:163:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> h
-    163:163:void checkName(com.android.tools.r8.graph.DexString):313 -> h
-    163:163:com.android.tools.r8.graph.DexValue parseEncodedValue():261 -> h
-    164:164:void checkName(com.android.tools.r8.graph.DexString):313:313 -> h
-    164:164:com.android.tools.r8.graph.DexValue parseEncodedValue():261 -> h
-    165:165:com.android.tools.r8.graph.DexValue parseEncodedValue():262:262 -> h
-    166:167:com.android.tools.r8.graph.DexValue parseEncodedValue():253:254 -> h
-    168:170:void checkName(com.android.tools.r8.graph.DexString):309:311 -> h
-    168:170:com.android.tools.r8.graph.DexValue parseEncodedValue():254 -> h
+    163:163:void checkName(com.android.tools.r8.graph.DexString):315 -> h
+    163:163:com.android.tools.r8.graph.DexValue parseEncodedValue():263 -> h
+    164:164:void checkName(com.android.tools.r8.graph.DexString):315:315 -> h
+    164:164:com.android.tools.r8.graph.DexValue parseEncodedValue():263 -> h
+    165:165:com.android.tools.r8.graph.DexValue parseEncodedValue():264:264 -> h
+    166:167:com.android.tools.r8.graph.DexValue parseEncodedValue():255:256 -> h
+    168:170:void checkName(com.android.tools.r8.graph.DexString):311:313 -> h
+    168:170:com.android.tools.r8.graph.DexValue parseEncodedValue():256 -> h
     171:171:com.android.tools.r8.graph.DexValue parseEncodedValue():0:0 -> h
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":258,"2":259,"3":260}}
-    258:258:void checkName(com.android.tools.r8.graph.DexString):311:311 -> h
-    258:258:com.android.tools.r8.graph.DexValue parseEncodedValue():254 -> h
-    259:259:void checkName(com.android.tools.r8.graph.DexString):311:311 -> h
-    259:259:com.android.tools.r8.graph.DexValue parseEncodedValue():254 -> h
-    260:260:void checkName(com.android.tools.r8.graph.DexString):311:311 -> h
-    260:260:com.android.tools.r8.graph.DexValue parseEncodedValue():254 -> h
-    172:172:void checkName(com.android.tools.r8.graph.DexString):313:313 -> h
-    172:172:com.android.tools.r8.graph.DexValue parseEncodedValue():254 -> h
+    258:258:void checkName(com.android.tools.r8.graph.DexString):313:313 -> h
+    258:258:com.android.tools.r8.graph.DexValue parseEncodedValue():256 -> h
+    259:259:void checkName(com.android.tools.r8.graph.DexString):313:313 -> h
+    259:259:com.android.tools.r8.graph.DexValue parseEncodedValue():256 -> h
+    260:260:void checkName(com.android.tools.r8.graph.DexString):313:313 -> h
+    260:260:com.android.tools.r8.graph.DexValue parseEncodedValue():256 -> h
+    172:172:void checkName(com.android.tools.r8.graph.DexString):315:315 -> h
+    172:172:com.android.tools.r8.graph.DexValue parseEncodedValue():256 -> h
     173:173:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> h
-    173:173:void checkName(com.android.tools.r8.graph.DexString):313 -> h
-    173:173:com.android.tools.r8.graph.DexValue parseEncodedValue():254 -> h
-    174:174:void checkName(com.android.tools.r8.graph.DexString):313:313 -> h
-    174:174:com.android.tools.r8.graph.DexValue parseEncodedValue():254 -> h
-    175:175:com.android.tools.r8.graph.DexValue parseEncodedValue():255:255 -> h
-    176:177:com.android.tools.r8.graph.DexValue parseEncodedValue():247:248 -> h
-    178:239:com.android.tools.r8.graph.DexValue parseEncodedValue():240:301 -> h
-    240:241:com.android.tools.r8.graph.DexValue parseEncodedValue():293:294 -> h
-    242:242:com.android.tools.r8.graph.DexValue parseEncodedValue():235:235 -> h
-    243:243:com.android.tools.r8.graph.DexValue parseEncodedValue():230:230 -> h
-    244:245:com.android.tools.r8.graph.DexValue parseEncodedValue():224:225 -> h
-    246:247:com.android.tools.r8.graph.DexValue parseEncodedValue():218:219 -> h
-    248:249:com.android.tools.r8.graph.DexValue parseEncodedValue():212:213 -> h
-    250:251:com.android.tools.r8.graph.DexValue parseEncodedValue():206:207 -> h
-    252:254:com.android.tools.r8.graph.DexValue parseEncodedValue():199:201 -> h
-    1:1:com.android.tools.r8.dex.DexSection[] parseMap():901:901 -> i
+    173:173:void checkName(com.android.tools.r8.graph.DexString):315 -> h
+    173:173:com.android.tools.r8.graph.DexValue parseEncodedValue():256 -> h
+    174:174:void checkName(com.android.tools.r8.graph.DexString):315:315 -> h
+    174:174:com.android.tools.r8.graph.DexValue parseEncodedValue():256 -> h
+    175:175:com.android.tools.r8.graph.DexValue parseEncodedValue():257:257 -> h
+    176:177:com.android.tools.r8.graph.DexValue parseEncodedValue():249:250 -> h
+    178:239:com.android.tools.r8.graph.DexValue parseEncodedValue():242:303 -> h
+    240:241:com.android.tools.r8.graph.DexValue parseEncodedValue():295:296 -> h
+    242:242:com.android.tools.r8.graph.DexValue parseEncodedValue():237:237 -> h
+    243:243:com.android.tools.r8.graph.DexValue parseEncodedValue():232:232 -> h
+    244:245:com.android.tools.r8.graph.DexValue parseEncodedValue():226:227 -> h
+    246:247:com.android.tools.r8.graph.DexValue parseEncodedValue():220:221 -> h
+    248:249:com.android.tools.r8.graph.DexValue parseEncodedValue():214:215 -> h
+    250:251:com.android.tools.r8.graph.DexValue parseEncodedValue():208:209 -> h
+    252:254:com.android.tools.r8.graph.DexValue parseEncodedValue():201:203 -> h
+    1:1:com.android.tools.r8.dex.DexSection[] parseMap():904:904 -> i
     2:2:int com.android.tools.r8.dex.BinaryReader.getUint(int):72:72 -> i
-    2:2:com.android.tools.r8.dex.DexSection[] parseMap():901 -> i
+    2:2:com.android.tools.r8.dex.DexSection[] parseMap():904 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:int com.android.tools.r8.dex.BinaryReader.getUint(int):72:73 -> i
-    3:4:com.android.tools.r8.dex.DexSection[] parseMap():901 -> i
-    5:13:com.android.tools.r8.dex.DexSection[] parseMap():902:910 -> i
+    3:4:com.android.tools.r8.dex.DexSection[] parseMap():904 -> i
+    5:13:com.android.tools.r8.dex.DexSection[] parseMap():905:913 -> i
     14:14:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
-    14:14:com.android.tools.r8.dex.DexSection[] parseMap():910 -> i
+    14:14:com.android.tools.r8.dex.DexSection[] parseMap():913 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
-    15:15:com.android.tools.r8.dex.DexSection[] parseMap():910 -> i
-    16:16:com.android.tools.r8.dex.DexSection[] parseMap():923:923 -> i
-    17:17:com.android.tools.r8.dex.DexSection[] parseMap():911:911 -> i
+    15:15:com.android.tools.r8.dex.DexSection[] parseMap():913 -> i
+    16:16:com.android.tools.r8.dex.DexSection[] parseMap():926:926 -> i
+    17:17:com.android.tools.r8.dex.DexSection[] parseMap():914:914 -> i
     18:18:com.android.tools.r8.dex.DexSection[] parseMap():0:0 -> i
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":969,"2":970,"3":971}}
-    969:969:com.android.tools.r8.dex.DexSection[] parseMap():911:911 -> i
-    970:970:com.android.tools.r8.dex.DexSection[] parseMap():911:911 -> i
-    971:971:com.android.tools.r8.dex.DexSection[] parseMap():911:911 -> i
-    932:932:com.android.tools.r8.dex.DexSection[] parseMap():914:914 -> i
-    933:933:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
-    933:933:com.android.tools.r8.dex.DexSection[] parseMap():920 -> i
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":972,"2":973,"3":974}}
+    972:972:com.android.tools.r8.dex.DexSection[] parseMap():914:914 -> i
+    973:973:com.android.tools.r8.dex.DexSection[] parseMap():914:914 -> i
+    974:974:com.android.tools.r8.dex.DexSection[] parseMap():914:914 -> i
+    935:935:com.android.tools.r8.dex.DexSection[] parseMap():917:917 -> i
+    936:936:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
+    936:936:com.android.tools.r8.dex.DexSection[] parseMap():923 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    934:934:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
-    934:934:com.android.tools.r8.dex.DexSection[] parseMap():920 -> i
-    935:935:com.android.tools.r8.dex.DexSection[] parseMap():920:920 -> i
-    936:936:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> i
-    936:936:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> i
-    936:936:com.android.tools.r8.dex.DexSection[] parseMap():920 -> i
-    937:952:com.android.tools.r8.dex.DexSection[] parseMap():920:935 -> i
-    953:965:com.android.tools.r8.dex.DexSection[] parseMap():929:941 -> i
-    966:966:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
-    966:966:com.android.tools.r8.dex.DexSection[] parseMap():941 -> i
+    937:937:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
+    937:937:com.android.tools.r8.dex.DexSection[] parseMap():923 -> i
+    938:938:com.android.tools.r8.dex.DexSection[] parseMap():923:923 -> i
+    939:939:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> i
+    939:939:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> i
+    939:939:com.android.tools.r8.dex.DexSection[] parseMap():923 -> i
+    940:955:com.android.tools.r8.dex.DexSection[] parseMap():923:938 -> i
+    956:968:com.android.tools.r8.dex.DexSection[] parseMap():932:944 -> i
+    969:969:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
+    969:969:com.android.tools.r8.dex.DexSection[] parseMap():944 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    967:967:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
-    967:967:com.android.tools.r8.dex.DexSection[] parseMap():941 -> i
-    968:968:com.android.tools.r8.dex.DexSection[] parseMap():941:941 -> i
-    1:8:void parseStringIDs():878:885 -> j
-    1:5:com.android.tools.r8.graph.DexTypeList parseTypeList():178:182 -> k
-    1:3:void populateStrings():1027:1029 -> l
-    1:3:void populateIndexTables():1016 -> l
-    4:6:com.android.tools.r8.graph.DexString stringAt(int):1255:1257 -> l
-    4:6:void populateStrings():1029 -> l
-    4:6:void populateIndexTables():1016 -> l
+    970:970:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> i
+    970:970:com.android.tools.r8.dex.DexSection[] parseMap():944 -> i
+    971:971:com.android.tools.r8.dex.DexSection[] parseMap():944:944 -> i
+    1:8:void parseStringIDs():881:888 -> j
+    1:5:com.android.tools.r8.graph.DexTypeList parseTypeList():180:184 -> k
+    1:3:void populateStrings():1030:1032 -> l
+    1:3:void populateIndexTables():1019 -> l
+    4:6:com.android.tools.r8.graph.DexString stringAt(int):1258:1260 -> l
+    4:6:void populateStrings():1032 -> l
+    4:6:void populateIndexTables():1019 -> l
     7:7:int com.android.tools.r8.dex.BinaryReader.getUleb128():44:44 -> l
-    7:7:com.android.tools.r8.graph.DexString stringAt(int):1257 -> l
-    7:7:void populateStrings():1029 -> l
-    7:7:void populateIndexTables():1016 -> l
-    8:11:com.android.tools.r8.graph.DexString stringAt(int):1258:1261 -> l
-    8:11:void populateStrings():1029 -> l
-    8:11:void populateIndexTables():1016 -> l
+    7:7:com.android.tools.r8.graph.DexString stringAt(int):1260 -> l
+    7:7:void populateStrings():1032 -> l
+    7:7:void populateIndexTables():1019 -> l
+    8:11:com.android.tools.r8.graph.DexString stringAt(int):1261:1264 -> l
+    8:11:void populateStrings():1032 -> l
+    8:11:void populateIndexTables():1019 -> l
     12:12:byte com.android.tools.r8.dex.BinaryReader.get():97:97 -> l
-    12:12:com.android.tools.r8.graph.DexString stringAt(int):1261 -> l
+    12:12:com.android.tools.r8.graph.DexString stringAt(int):1264 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:12:void populateStrings():1029 -> l
-    12:12:void populateIndexTables():1016 -> l
+    12:12:void populateStrings():1032 -> l
+    12:12:void populateIndexTables():1019 -> l
     13:13:byte com.android.tools.r8.dex.BinaryReader.get():97:97 -> l
-    13:13:com.android.tools.r8.graph.DexString stringAt(int):1261 -> l
-    13:13:void populateStrings():1029 -> l
-    13:13:void populateIndexTables():1016 -> l
-    14:16:com.android.tools.r8.graph.DexString stringAt(int):1262:1264 -> l
-    14:16:void populateStrings():1029 -> l
-    14:16:void populateIndexTables():1016 -> l
-    17:17:void populateStrings():1029:1029 -> l
-    17:17:void populateIndexTables():1016 -> l
-    18:26:void populateChecksums():1062:1070 -> l
-    18:26:void populateIndexTables():1017 -> l
-    27:28:void populateTypes():1050:1051 -> l
-    27:28:void populateIndexTables():1018 -> l
-    29:48:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1079:1098 -> l
-    29:48:void populateTypes():1051 -> l
-    29:48:void populateIndexTables():1018 -> l
-    49:49:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1093:1093 -> l
-    49:49:void populateTypes():1051 -> l
-    49:49:void populateIndexTables():1018 -> l
-    50:52:void populateTypes():1052:1054 -> l
-    50:52:void populateIndexTables():1018 -> l
-    53:58:com.android.tools.r8.graph.DexType typeAt(int):1268:1273 -> l
-    53:58:void populateTypes():1055 -> l
-    53:58:void populateIndexTables():1018 -> l
+    13:13:com.android.tools.r8.graph.DexString stringAt(int):1264 -> l
+    13:13:void populateStrings():1032 -> l
+    13:13:void populateIndexTables():1019 -> l
+    14:16:com.android.tools.r8.graph.DexString stringAt(int):1265:1267 -> l
+    14:16:void populateStrings():1032 -> l
+    14:16:void populateIndexTables():1019 -> l
+    17:17:void populateStrings():1032:1032 -> l
+    17:17:void populateIndexTables():1019 -> l
+    18:26:void populateChecksums():1065:1073 -> l
+    18:26:void populateIndexTables():1020 -> l
+    27:28:void populateTypes():1053:1054 -> l
+    27:28:void populateIndexTables():1021 -> l
+    29:48:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1082:1101 -> l
+    29:48:void populateTypes():1054 -> l
+    29:48:void populateIndexTables():1021 -> l
+    49:49:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1096:1096 -> l
+    49:49:void populateTypes():1054 -> l
+    49:49:void populateIndexTables():1021 -> l
+    50:52:void populateTypes():1055:1057 -> l
+    50:52:void populateIndexTables():1021 -> l
+    53:58:com.android.tools.r8.graph.DexType typeAt(int):1271:1276 -> l
+    53:58:void populateTypes():1058 -> l
+    53:58:void populateIndexTables():1021 -> l
     59:59:int com.android.tools.r8.dex.BinaryReader.getUint(int):72:72 -> l
-    59:59:com.android.tools.r8.graph.DexType typeAt(int):1273 -> l
-    59:59:void populateTypes():1055 -> l
-    59:59:void populateIndexTables():1018 -> l
+    59:59:com.android.tools.r8.graph.DexType typeAt(int):1276 -> l
+    59:59:void populateTypes():1058 -> l
+    59:59:void populateIndexTables():1021 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
     60:61:int com.android.tools.r8.dex.BinaryReader.getUint(int):72:73 -> l
-    60:61:com.android.tools.r8.graph.DexType typeAt(int):1273 -> l
-    60:61:void populateTypes():1055 -> l
-    60:61:void populateIndexTables():1018 -> l
-    62:62:com.android.tools.r8.graph.DexType typeAt(int):1274:1274 -> l
-    62:62:void populateTypes():1055 -> l
-    62:62:void populateIndexTables():1018 -> l
-    63:64:void populateTypes():1056:1057 -> l
-    63:64:void populateIndexTables():1018 -> l
-    65:66:void populateFields():1107:1108 -> l
-    65:66:void populateIndexTables():1019 -> l
-    67:102:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1123:1158 -> l
-    67:102:void populateFields():1108 -> l
-    67:102:void populateIndexTables():1019 -> l
-    103:113:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1155:1165 -> l
-    103:113:void populateFields():1108 -> l
-    103:113:void populateIndexTables():1019 -> l
-    114:118:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1162:1166 -> l
-    114:118:void populateFields():1108 -> l
-    114:118:void populateIndexTables():1019 -> l
-    119:119:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1151:1151 -> l
-    119:119:void populateFields():1108 -> l
-    119:119:void populateIndexTables():1019 -> l
-    120:122:void populateFields():1109:1111 -> l
-    120:122:void populateIndexTables():1019 -> l
-    123:135:com.android.tools.r8.graph.DexField fieldAt(int):1278:1290 -> l
-    123:135:void populateFields():1111 -> l
-    123:135:void populateIndexTables():1019 -> l
-    136:136:void populateFields():1111:1111 -> l
-    136:136:void populateIndexTables():1019 -> l
-    137:140:void populateProtos():1177:1180 -> l
-    137:140:void populateIndexTables():1020 -> l
-    141:153:com.android.tools.r8.graph.DexProto protoAt(int):1353:1365 -> l
-    141:153:void populateProtos():1180 -> l
-    141:153:void populateIndexTables():1020 -> l
-    154:154:void populateProtos():1180:1180 -> l
-    154:154:void populateIndexTables():1020 -> l
-    155:156:void populateMethods():1185:1186 -> l
-    155:156:void populateIndexTables():1021 -> l
-    157:192:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1201:1236 -> l
-    157:192:void populateMethods():1186 -> l
-    157:192:void populateIndexTables():1021 -> l
-    193:203:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1233:1243 -> l
-    193:203:void populateMethods():1186 -> l
-    193:203:void populateIndexTables():1021 -> l
-    204:208:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1240:1244 -> l
-    204:208:void populateMethods():1186 -> l
-    204:208:void populateIndexTables():1021 -> l
-    209:209:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1229:1229 -> l
-    209:209:void populateMethods():1186 -> l
-    209:209:void populateIndexTables():1021 -> l
-    210:212:void populateMethods():1187:1189 -> l
-    210:212:void populateIndexTables():1021 -> l
-    213:225:com.android.tools.r8.graph.DexMethod methodAt(int):1369:1381 -> l
-    213:225:void populateMethods():1189 -> l
-    213:225:void populateIndexTables():1021 -> l
-    226:226:com.android.tools.r8.graph.DexMethod methodAt(int):1378:1378 -> l
-    226:226:void populateMethods():1189 -> l
-    226:226:void populateIndexTables():1021 -> l
-    227:227:void populateMethods():1189:1189 -> l
-    227:227:void populateIndexTables():1021 -> l
-    228:231:void populateMethodHandles():1034:1037 -> l
-    228:231:void populateIndexTables():1022 -> l
-    232:261:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1294:1323 -> l
-    232:261:void populateMethodHandles():1037 -> l
-    232:261:void populateIndexTables():1022 -> l
-    262:262:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1319:1319 -> l
-    262:262:void populateMethodHandles():1037 -> l
-    262:262:void populateIndexTables():1022 -> l
-    263:280:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1310:1327 -> l
-    263:280:void populateMethodHandles():1037 -> l
-    263:280:void populateIndexTables():1022 -> l
+    60:61:com.android.tools.r8.graph.DexType typeAt(int):1276 -> l
+    60:61:void populateTypes():1058 -> l
+    60:61:void populateIndexTables():1021 -> l
+    62:62:com.android.tools.r8.graph.DexType typeAt(int):1277:1277 -> l
+    62:62:void populateTypes():1058 -> l
+    62:62:void populateIndexTables():1021 -> l
+    63:64:void populateTypes():1059:1060 -> l
+    63:64:void populateIndexTables():1021 -> l
+    65:66:void populateFields():1110:1111 -> l
+    65:66:void populateIndexTables():1022 -> l
+    67:102:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1126:1161 -> l
+    67:102:void populateFields():1111 -> l
+    67:102:void populateIndexTables():1022 -> l
+    103:113:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1158:1168 -> l
+    103:113:void populateFields():1111 -> l
+    103:113:void populateIndexTables():1022 -> l
+    114:118:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1165:1169 -> l
+    114:118:void populateFields():1111 -> l
+    114:118:void populateIndexTables():1022 -> l
+    119:119:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1154:1154 -> l
+    119:119:void populateFields():1111 -> l
+    119:119:void populateIndexTables():1022 -> l
+    120:122:void populateFields():1112:1114 -> l
+    120:122:void populateIndexTables():1022 -> l
+    123:135:com.android.tools.r8.graph.DexField fieldAt(int):1281:1293 -> l
+    123:135:void populateFields():1114 -> l
+    123:135:void populateIndexTables():1022 -> l
+    136:136:void populateFields():1114:1114 -> l
+    136:136:void populateIndexTables():1022 -> l
+    137:140:void populateProtos():1180:1183 -> l
+    137:140:void populateIndexTables():1023 -> l
+    141:153:com.android.tools.r8.graph.DexProto protoAt(int):1356:1368 -> l
+    141:153:void populateProtos():1183 -> l
+    141:153:void populateIndexTables():1023 -> l
+    154:154:void populateProtos():1183:1183 -> l
+    154:154:void populateIndexTables():1023 -> l
+    155:156:void populateMethods():1188:1189 -> l
+    155:156:void populateIndexTables():1024 -> l
+    157:192:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1204:1239 -> l
+    157:192:void populateMethods():1189 -> l
+    157:192:void populateIndexTables():1024 -> l
+    193:203:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1236:1246 -> l
+    193:203:void populateMethods():1189 -> l
+    193:203:void populateIndexTables():1024 -> l
+    204:208:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1243:1247 -> l
+    204:208:void populateMethods():1189 -> l
+    204:208:void populateIndexTables():1024 -> l
+    209:209:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1232:1232 -> l
+    209:209:void populateMethods():1189 -> l
+    209:209:void populateIndexTables():1024 -> l
+    210:212:void populateMethods():1190:1192 -> l
+    210:212:void populateIndexTables():1024 -> l
+    213:225:com.android.tools.r8.graph.DexMethod methodAt(int):1372:1384 -> l
+    213:225:void populateMethods():1192 -> l
+    213:225:void populateIndexTables():1024 -> l
+    226:226:com.android.tools.r8.graph.DexMethod methodAt(int):1381:1381 -> l
+    226:226:void populateMethods():1192 -> l
+    226:226:void populateIndexTables():1024 -> l
+    227:227:void populateMethods():1192:1192 -> l
+    227:227:void populateIndexTables():1024 -> l
+    228:231:void populateMethodHandles():1037:1040 -> l
+    228:231:void populateIndexTables():1025 -> l
+    232:261:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1297:1326 -> l
+    232:261:void populateMethodHandles():1040 -> l
+    232:261:void populateIndexTables():1025 -> l
+    262:262:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1322:1322 -> l
+    262:262:void populateMethodHandles():1040 -> l
+    262:262:void populateIndexTables():1025 -> l
+    263:280:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1313:1330 -> l
+    263:280:void populateMethodHandles():1040 -> l
+    263:280:void populateIndexTables():1025 -> l
     281:281:com.android.tools.r8.graph.DexMethodHandle com.android.tools.r8.graph.DexItemFactory.createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2828:2828 -> l
-    281:281:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1327 -> l
+    281:281:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1330 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    281:281:void populateMethodHandles():1037 -> l
-    281:281:void populateIndexTables():1022 -> l
-    282:282:void populateMethodHandles():1037:1037 -> l
-    282:282:void populateIndexTables():1022 -> l
-    283:286:void populateCallSites():1042:1045 -> l
-    283:286:void populateIndexTables():1023 -> l
-    287:291:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1332:1336 -> l
-    287:291:void populateCallSites():1045 -> l
-    287:291:void populateIndexTables():1023 -> l
+    281:281:void populateMethodHandles():1040 -> l
+    281:281:void populateIndexTables():1025 -> l
+    282:282:void populateMethodHandles():1040:1040 -> l
+    282:282:void populateIndexTables():1025 -> l
+    283:286:void populateCallSites():1045:1048 -> l
+    283:286:void populateIndexTables():1026 -> l
+    287:291:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1335:1339 -> l
+    287:291:void populateCallSites():1048 -> l
+    287:291:void populateIndexTables():1026 -> l
     292:292:int com.android.tools.r8.dex.BinaryReader.getUint(int):72:72 -> l
-    292:292:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1337 -> l
-    292:292:void populateCallSites():1045 -> l
-    292:292:void populateIndexTables():1023 -> l
+    292:292:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1340 -> l
+    292:292:void populateCallSites():1048 -> l
+    292:292:void populateIndexTables():1026 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
     293:294:int com.android.tools.r8.dex.BinaryReader.getUint(int):72:73 -> l
-    293:294:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1337 -> l
-    293:294:void populateCallSites():1045 -> l
-    293:294:void populateIndexTables():1023 -> l
-    295:297:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1338:1340 -> l
-    295:297:void populateCallSites():1045 -> l
-    295:297:void populateIndexTables():1023 -> l
+    293:294:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1340 -> l
+    293:294:void populateCallSites():1048 -> l
+    293:294:void populateIndexTables():1026 -> l
+    295:297:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1341:1343 -> l
+    295:297:void populateCallSites():1048 -> l
+    295:297:void populateIndexTables():1026 -> l
     298:298:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> l
-    298:298:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1340 -> l
-    298:298:void populateCallSites():1045 -> l
-    298:298:void populateIndexTables():1023 -> l
-    299:301:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1340:1342 -> l
-    299:301:void populateCallSites():1045 -> l
-    299:301:void populateIndexTables():1023 -> l
+    298:298:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1343 -> l
+    298:298:void populateCallSites():1048 -> l
+    298:298:void populateIndexTables():1026 -> l
+    299:301:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1343:1345 -> l
+    299:301:void populateCallSites():1048 -> l
+    299:301:void populateIndexTables():1026 -> l
     302:302:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> l
-    302:302:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1342 -> l
-    302:302:void populateCallSites():1045 -> l
-    302:302:void populateIndexTables():1023 -> l
-    303:310:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1342:1349 -> l
-    303:310:void populateCallSites():1045 -> l
-    303:310:void populateIndexTables():1023 -> l
-    311:311:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1344:1344 -> l
-    311:311:void populateCallSites():1045 -> l
-    311:311:void populateIndexTables():1023 -> l
-    312:312:void populateCallSites():1045:1045 -> l
-    312:312:void populateIndexTables():1023 -> l
+    302:302:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1345 -> l
+    302:302:void populateCallSites():1048 -> l
+    302:302:void populateIndexTables():1026 -> l
+    303:310:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1345:1352 -> l
+    303:310:void populateCallSites():1048 -> l
+    303:310:void populateIndexTables():1026 -> l
+    311:311:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1347:1347 -> l
+    311:311:void populateCallSites():1048 -> l
+    311:311:void populateIndexTables():1026 -> l
+    312:312:void populateCallSites():1048:1048 -> l
+    312:312:void populateIndexTables():1026 -> l
 com.android.tools.r8.dex.DexParser$AnnotationsDirectory -> com.android.tools.r8.dex.f:
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] NO_METHOD_ANNOTATIONS -> g
     com.android.tools.r8.dex.DexParser$AnnotationsDirectory THE_EMPTY_ANNOTATIONS_DIRECTORY -> h
@@ -16950,41 +17003,43 @@
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] methods -> c
     com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] parameters -> d
     com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] NO_FIELD_ANNOTATIONS -> f
-    1:10:void <clinit>():1386:1395 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1409:1413 -> <init>
-    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1417:1417 -> a
+    1:10:void <clinit>():1389:1398 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1412:1416 -> <init>
+    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1420:1420 -> a
 com.android.tools.r8.dex.DexParser$AttributesAndAnnotations -> com.android.tools.r8.dex.g:
     com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMethodAttribute -> b
+    boolean $assertionsDisabled -> i
     java.util.List lazyAnnotations -> d
     com.android.tools.r8.graph.DexAnnotationSet originalAnnotations -> a
     java.util.List innerClasses -> c
+    java.util.List permittedSubclassesAttribute -> h
     java.util.List nestMembersAttribute -> g
-    boolean $assertionsDisabled -> h
     com.android.tools.r8.graph.GenericSignature$ClassSignature classSignature -> e
     com.android.tools.r8.graph.NestHostClassAttribute nestHostAttribute -> f
-    1:1:void <clinit>():1421:1421 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1454:1454 -> <init>
-    2:55:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1424:1477 -> <init>
-    56:72:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1476:1492 -> <init>
-    73:124:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1491:1542 -> <init>
-    125:140:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1537:1552 -> <init>
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute access$100(com.android.tools.r8.dex.DexParser$AttributesAndAnnotations):1421:1421 -> a
-    2:8:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1432:1438 -> a
-    9:11:void ensureAnnotations(int):1558:1560 -> a
-    12:13:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1565:1566 -> a
-    1:1:java.util.List access$200(com.android.tools.r8.dex.DexParser$AttributesAndAnnotations):1421:1421 -> b
-    2:2:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1446:1446 -> b
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature access$300(com.android.tools.r8.dex.DexParser$AttributesAndAnnotations):1421:1421 -> c
-    2:2:java.util.List getInnerClasses():1442:1442 -> c
+    1:1:void <clinit>():1424:1424 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1458:1458 -> <init>
+    2:56:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1427:1481 -> <init>
+    57:73:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1480:1496 -> <init>
+    74:133:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1495:1554 -> <init>
+    134:149:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.utils.InternalOptions):1549:1564 -> <init>
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute access$100(com.android.tools.r8.dex.DexParser$AttributesAndAnnotations):1424:1424 -> a
+    2:8:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1436:1442 -> a
+    9:11:void ensureAnnotations(int):1570:1572 -> a
+    12:13:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1577:1578 -> a
+    1:1:java.util.List access$200(com.android.tools.r8.dex.DexParser$AttributesAndAnnotations):1424:1424 -> b
+    2:2:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1450:1450 -> b
+    1:1:java.util.List access$300(com.android.tools.r8.dex.DexParser$AttributesAndAnnotations):1424:1424 -> c
+    2:2:java.util.List getInnerClasses():1446:1446 -> c
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature access$400(com.android.tools.r8.dex.DexParser$AttributesAndAnnotations):1424:1424 -> d
 com.android.tools.r8.dex.DexParser$MemberAnnotationIterator -> com.android.tools.r8.dex.h:
     java.util.function.Supplier emptyValue -> c
     com.android.tools.r8.graph.DexMemberAnnotation[] annotations -> b
     int index -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):633:633 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):640:640 -> <init>
-    3:10:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):635:642 -> <init>
-    1:7:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.DexMember):652:658 -> a
-    8:8:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.DexMember):656:656 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier,com.android.tools.r8.dex.DexParser$1):635:635 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):642:642 -> <init>
+    3:10:void <init>(com.android.tools.r8.graph.DexMemberAnnotation[],java.util.function.Supplier):637:644 -> <init>
+    1:7:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.DexMember):654:660 -> a
+    8:8:com.android.tools.r8.graph.DexItem getNextFor(com.android.tools.r8.graph.DexMember):658:658 -> a
 com.android.tools.r8.dex.DexReader -> com.android.tools.r8.dex.j:
     com.android.tools.r8.utils.DexVersion version -> d
     1:2:void <init>(com.android.tools.r8.ProgramResource):27:28 -> <init>
@@ -17043,7 +17098,7 @@
     2:2:java.lang.String typeName():33:33 -> toString
     2:2:java.lang.String toString():83 -> toString
     3:3:java.lang.String toString():83:83 -> toString
-com.android.tools.r8.dex.FileWriter -> com.android.tools.r8.internal.bl:
+com.android.tools.r8.dex.FileWriter -> com.android.tools.r8.internal.gl:
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> c
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -17076,7 +17131,7 @@
     20:20:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):130 -> a
     21:21:void writeEncodedAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):131:131 -> a
     22:22:int lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):126:126 -> a
-    23:23:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
+    23:23:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):69:69 -> a
     23:23:int lambda$writeEncodedAnnotation$0(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexAnnotationElement):126 -> a
     24:36:com.android.tools.r8.dex.FileWriter collect():137:149 -> a
     37:37:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexProto.getParameters():87:87 -> a
@@ -17255,7 +17310,7 @@
     8:8:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():164:164 -> b
     9:22:boolean com.android.tools.r8.dex.FileWriter.verifyNames():323:336 -> b
     9:22:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():164 -> b
-    23:30:boolean com.android.tools.r8.graph.DexString.isValidSimpleName(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):404:411 -> b
+    23:30:boolean com.android.tools.r8.graph.DexString.isValidSimpleName(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):408:415 -> b
     23:30:boolean com.android.tools.r8.dex.FileWriter.verifyNames():336 -> b
     23:30:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():164 -> b
     31:32:boolean com.android.tools.r8.dex.FileWriter.verifyNames():336:337 -> b
@@ -17266,11 +17321,11 @@
     34:38:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():166:170 -> b
     39:39:com.android.tools.r8.dex.MixedSectionLayoutStrategy com.android.tools.r8.dex.MixedSectionLayoutStrategy.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.FileWriter$MixedSectionOffsets,com.android.tools.r8.dex.VirtualFile):26:26 -> b
     39:39:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():171 -> b
-    40:40:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> b
+    40:40:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> b
     40:40:com.android.tools.r8.dex.MixedSectionLayoutStrategy com.android.tools.r8.dex.MixedSectionLayoutStrategy.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.FileWriter$MixedSectionOffsets,com.android.tools.r8.dex.VirtualFile):26 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:40:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():171 -> b
-    41:41:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> b
+    41:41:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> b
     41:41:com.android.tools.r8.dex.MixedSectionLayoutStrategy com.android.tools.r8.dex.MixedSectionLayoutStrategy.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.FileWriter$MixedSectionOffsets,com.android.tools.r8.dex.VirtualFile):26 -> b
     41:41:com.android.tools.r8.dex.FileWriter$ByteBufferResult generate():171 -> b
     42:49:com.android.tools.r8.dex.MixedSectionLayoutStrategy com.android.tools.r8.dex.MixedSectionLayoutStrategy.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.FileWriter$MixedSectionOffsets,com.android.tools.r8.dex.VirtualFile):28:35 -> b
@@ -17374,10 +17429,10 @@
     307:307:void writeStringItem(com.android.tools.r8.graph.DexString):412:412 -> b
     308:308:int lambda$writeAnnotationDirectory$3(com.android.tools.r8.graph.DexEncodedMethod):603:603 -> b
     309:309:void writeClassData(com.android.tools.r8.graph.DexProgramClass):652:652 -> b
-    310:310:boolean com.android.tools.r8.graph.DexProgramClass.hasMethodsOrFields():626:626 -> b
+    310:310:boolean com.android.tools.r8.graph.DexProgramClass.hasMethodsOrFields():630:630 -> b
     310:310:void writeClassData(com.android.tools.r8.graph.DexProgramClass):652 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    311:311:boolean com.android.tools.r8.graph.DexProgramClass.hasMethodsOrFields():626:626 -> b
+    311:311:boolean com.android.tools.r8.graph.DexProgramClass.hasMethodsOrFields():630:630 -> b
     311:311:void writeClassData(com.android.tools.r8.graph.DexProgramClass):652 -> b
     312:314:void writeClassData(com.android.tools.r8.graph.DexProgramClass):652:654 -> b
     315:315:void com.android.tools.r8.dex.DexOutputBuffer.putUleb128(int):79:79 -> b
@@ -17395,18 +17450,18 @@
     1:5:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):449:453 -> c
     6:10:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):452:456 -> c
     11:14:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):455:458 -> c
-    15:15:boolean com.android.tools.r8.graph.DexProgramClass.hasMethodsOrFields():626:626 -> c
+    15:15:boolean com.android.tools.r8.graph.DexProgramClass.hasMethodsOrFields():630:630 -> c
     15:15:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):459 -> c
     16:16:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):459:459 -> c
     17:20:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):458:461 -> c
     21:21:void writeClassDefItem(com.android.tools.r8.graph.DexProgramClass):460:460 -> c
     22:22:int lambda$writeAnnotationDirectory$4(com.android.tools.r8.graph.DexEncodedMethod):605:605 -> c
-com.android.tools.r8.dex.FileWriter$ByteBufferResult -> com.android.tools.r8.internal.Xk:
+com.android.tools.r8.dex.FileWriter$ByteBufferResult -> com.android.tools.r8.internal.cl:
     com.android.tools.r8.dex.CompatByteBuffer buffer -> a
     int length -> b
     1:1:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int,com.android.tools.r8.dex.FileWriter$1):79:79 -> <init>
     2:4:void <init>(com.android.tools.r8.dex.CompatByteBuffer,int):85:87 -> <init>
-com.android.tools.r8.dex.FileWriter$Layout -> com.android.tools.r8.internal.Yk:
+com.android.tools.r8.dex.FileWriter$Layout -> com.android.tools.r8.internal.dl:
     int annotationSetsOffset -> n
     int annotationSetRefListsOffset -> o
     int stringDataOffsets -> l
@@ -17461,7 +17516,7 @@
     3:4:void setStringDataOffsets(int):965:966 -> l
     1:2:int getTypeListsOffset():950:951 -> m
     3:4:void setTypeListsOffset(int):955:956 -> m
-com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.internal.Zk:
+com.android.tools.r8.dex.FileWriter$MixedSectionOffsets -> com.android.tools.r8.internal.el:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap debugInfos -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap typeLists -> c
@@ -17586,13 +17641,13 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():87:87 -> l
     2:2:java.util.Collection getTypeLists():1196 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.android.tools.r8.internal.al:
+com.android.tools.r8.dex.FileWriter$ProgramClassDependencyCollector -> com.android.tools.r8.internal.fl:
     java.util.Set includedClasses -> c
     com.android.tools.r8.dex.FileWriter this$0 -> d
     1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass[]):1365:1366 -> <init>
     3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass[]):1363:1367 -> <init>
     1:2:void visit(com.android.tools.r8.graph.DexProgramClass):1373:1374 -> b
-com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.Wp:
+com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.bq:
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> a
     boolean addField(com.android.tools.r8.graph.DexField) -> a
@@ -17601,7 +17656,7 @@
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
     boolean addType(com.android.tools.r8.graph.DexType) -> a
-com.android.tools.r8.dex.InheritanceClassInDexDistributor -> com.android.tools.r8.internal.dq:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor -> com.android.tools.r8.internal.iq:
     com.android.tools.r8.dex.VirtualFile mainDex -> b
     com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo directSubClasses -> i
     java.util.List filesForDistribution -> d
@@ -17658,7 +17713,7 @@
     574:574:java.util.Collection assignClassesWithLinkingError(java.util.Set,com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.Collection):445:445 -> a
     575:575:java.util.Collection assignClassesWithLinkingError(java.util.Set,com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.Collection):445:445 -> a
     555:555:java.util.Collection assignClassesWithLinkingError(java.util.Set,com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.Collection):445:445 -> a
-    556:556:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    556:556:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     556:556:java.util.Collection assignClassesWithLinkingError(java.util.Set,com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.Collection):446 -> a
     557:557:java.util.Collection assignClassesWithLinkingError(java.util.Set,com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.Collection):446:446 -> a
     558:558:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -17779,7 +17834,7 @@
     789:789:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638:638 -> b
     790:790:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638:638 -> b
     746:746:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):638:638 -> b
-    747:747:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> b
+    747:747:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> b
     747:747:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):639 -> b
     748:748:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):639:639 -> b
     749:749:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
@@ -17790,7 +17845,7 @@
     751:761:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):639:649 -> b
     762:786:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):631:655 -> b
     787:787:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):654:654 -> b
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$CategorizedInheritanceGroupWithMainDexDependency -> com.android.tools.r8.internal.aq:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$CategorizedInheritanceGroupWithMainDexDependency -> com.android.tools.r8.internal.fq:
     com.android.tools.r8.dex.InheritanceClassInDexDistributor this$0 -> d
     java.util.Set dependentsOfMainDexIndependents -> c
     boolean $assertionsDisabled -> e
@@ -17842,7 +17897,7 @@
     62:62: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):59:59 -> a
     62:62:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):220 -> a
     63:73:boolean isDependingOnMainDexIndependents(com.android.tools.r8.graph.DexProgramClass):220:230 -> a
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup -> com.android.tools.r8.internal.bq:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup -> com.android.tools.r8.internal.gq:
     com.android.tools.r8.dex.InheritanceClassInDexDistributor this$0 -> f
     boolean dependsOnMainDexClasses -> e
     int numberOfMethodIds -> d
@@ -17862,7 +17917,7 @@
     12:25:int compareTo(java.lang.Object):54 -> compareTo
     26:29:int com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup.compareTo(com.android.tools.r8.dex.InheritanceClassInDexDistributor$ClassGroup):107:110 -> compareTo
     26:29:int compareTo(java.lang.Object):54 -> compareTo
-com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo -> com.android.tools.r8.internal.cq:
+com.android.tools.r8.dex.InheritanceClassInDexDistributor$DirectSubClassesInfo -> com.android.tools.r8.internal.hq:
     java.util.Map directSubClasses -> a
     java.util.Set classes -> b
     boolean $assertionsDisabled -> c
@@ -17880,7 +17935,7 @@
     4:7: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):272:275 -> a
     8:9:java.util.Collection getDirectSubClasses(com.android.tools.r8.graph.DexProgramClass):260:261 -> a
     1:1:java.util.Collection lambda$addDirectSubClass$0(com.android.tools.r8.graph.DexProgramClass):274:274 -> b
-com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.yx:
+com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.Ex:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.DexString firstJumboString -> b
     java.util.Map instructionTargets -> d
@@ -17953,10 +18008,10 @@
     382:413:com.android.tools.r8.graph.DexCode rewrite():125 -> a
     414:426:com.android.tools.r8.graph.DexCode rewrite():127:139 -> a
     com.android.tools.r8.dex.code.DexInstruction lambda$replaceTarget$1(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.dex.code.DexInstruction) -> b
-com.android.tools.r8.dex.JumboStringRewriter$1 -> com.android.tools.r8.internal.wx:
+com.android.tools.r8.dex.JumboStringRewriter$1 -> com.android.tools.r8.internal.Cx:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():282:282 -> <clinit>
-com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.xx:
+com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.Dx:
     com.android.tools.r8.dex.code.DexInstruction start -> a
     com.android.tools.r8.dex.code.DexInstruction end -> b
     boolean endsAfterLastInstruction -> c
@@ -17966,7 +18021,7 @@
     1:5:void replaceTarget(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.dex.code.DexInstruction):73:77 -> a
     6:6:int getStartOffset():82:82 -> a
     1:4:int getStartToEndDelta():86:89 -> b
-com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.EF:
+com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.LF:
     com.android.tools.r8.dex.Marker$Tool tool -> b
     boolean $assertionsDisabled -> f
     java.lang.String D8_PREFIX -> c
@@ -18060,12 +18115,12 @@
     1:1:boolean isL8():132:132 -> n
     1:1:boolean isRelocator():136:136 -> o
     1:5:java.lang.String toString():274:278 -> toString
-com.android.tools.r8.dex.Marker$Backend$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.DF:
+com.android.tools.r8.dex.Marker$Backend$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.KF:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String name(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.EF$a:
+com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.LF$a:
     com.android.tools.r8.dex.Marker$Tool D8 -> b
     com.android.tools.r8.dex.Marker$Tool[] $VALUES -> f
     com.android.tools.r8.dex.Marker$Tool Relocator -> e
@@ -18076,7 +18131,7 @@
     1:1:void <init>(java.lang.String,int):36:36 -> <init>
     1:1:com.android.tools.r8.dex.Marker$Tool[] valuesR8andD8():43:43 -> a
     1:1:com.android.tools.r8.dex.Marker$Tool[] values():36:36 -> values
-com.android.tools.r8.dex.MixedSectionCollection -> com.android.tools.r8.internal.iH:
+com.android.tools.r8.dex.MixedSectionCollection -> com.android.tools.r8.internal.pH:
     1:1:void <init>():27:27 -> <init>
     boolean add(com.android.tools.r8.graph.DexAnnotation) -> a
     boolean add(com.android.tools.r8.graph.DexAnnotationSet) -> a
@@ -18088,9 +18143,9 @@
     boolean add(com.android.tools.r8.graph.DexDebugInfoForWriting) -> a
     void setAnnotationsDirectoryForClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationDirectory) -> a
     1:1:void visit(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> b
-com.android.tools.r8.dex.MixedSectionLayoutStrategy -> com.android.tools.r8.internal.jH:
+com.android.tools.r8.dex.MixedSectionLayoutStrategy -> com.android.tools.r8.internal.qH:
     1:1:void <init>():21:21 -> <init>
-com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.jV:
+com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.EV:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> e
@@ -18131,31 +18186,31 @@
     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
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.dex.ResourceAdapter):32:32 -> d
-com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.dV:
+com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.yV:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):415:415 -> <init>
     1:1:boolean isRenamingCandidate(int,int):420:420 -> b
-com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.eV:
+com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.zV:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):447:447 -> <init>
     boolean isRenamingCandidate(int,int) -> b
-com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.fV:
+com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.AV:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):349:349 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean shouldRecordPrefix(char):364:364 -> a
     2:2:boolean handlePrefix(int,int):369:369 -> a
     char getClassNameSeparator() -> b
     1:2:boolean isRenamingCandidate(int,int):375:376 -> b
-com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.gV:
+com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.BV:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):386:386 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean shouldRecordPrefix(char):401:401 -> a
     2:5:boolean handlePrefix(int,int):406:409 -> a
     6:6:boolean handlePrefix(int,int):407:407 -> a
     char getClassNameSeparator() -> b
-com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.hV:
+com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.CV:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):426:426 -> <init>
     char getClassNameSeparator() -> b
     1:1:boolean isRenamingCandidate(int,int):441:441 -> b
-com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.iV:
+com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.DV:
     java.lang.StringBuilder result -> b
     java.lang.String contents -> a
     int outputFrom -> d
@@ -18260,7 +18315,7 @@
     89:89:void com.android.tools.r8.dex.ResourceAdapter$StringAdapter.outputRangeFromInput(int,int):329:329 -> d
     89:89:boolean run():183 -> d
     90:93:boolean run():187:190 -> d
-com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy -> com.android.tools.r8.internal.DY:
+com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy -> com.android.tools.r8.internal.YY:
     java.util.LinkedHashSet annotationDirectoryLayout -> f
     java.util.LinkedHashSet annotationSetLayout -> g
     com.android.tools.r8.experimental.startup.StartupOrder startupOrderForWriting -> d
@@ -18329,7 +18384,7 @@
     3:3:java.util.Collection getTypeListLayout():141 -> i
     4:4:java.util.Collection com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy.amendStartupLayout(java.util.Collection,java.util.Collection):92:92 -> i
     4:4:java.util.Collection getTypeListLayout():141 -> i
-com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$StartupIndexedItemCollection -> com.android.tools.r8.internal.CY:
+com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$StartupIndexedItemCollection -> com.android.tools.r8.internal.XY:
     com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy this$0 -> a
     1:1:void <init>(com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy):144:144 -> <init>
     2:2:void <init>(com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy,com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$1):144:144 -> <init>
@@ -18347,10 +18402,10 @@
     7:8:void addAnnotationSetRefList(com.android.tools.r8.graph.ParameterAnnotationsList):157:158 -> a
     9:9:boolean addString(com.android.tools.r8.graph.DexString):195:195 -> a
     10:10:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):217:217 -> a
-    11:11:boolean com.android.tools.r8.graph.DexProgramClass.hasMethodsOrFields():626:626 -> a
+    11:11:boolean com.android.tools.r8.graph.DexProgramClass.hasMethodsOrFields():630:630 -> a
     11:11:boolean addClass(com.android.tools.r8.graph.DexProgramClass):164 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:12:boolean com.android.tools.r8.graph.DexProgramClass.hasMethodsOrFields():626:626 -> a
+    12:12:boolean com.android.tools.r8.graph.DexProgramClass.hasMethodsOrFields():630:630 -> a
     12:12:boolean addClass(com.android.tools.r8.graph.DexProgramClass):164 -> a
     13:15:boolean addClass(com.android.tools.r8.graph.DexProgramClass):165:167 -> a
     16:17:void com.android.tools.r8.dex.StartupMixedSectionLayoutStrategy$StartupIndexedItemCollection.addTypeList(com.android.tools.r8.graph.DexTypeList):210:211 -> a
@@ -18413,7 +18468,7 @@
     15:15:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> f
     15:15:void setByteOrder():87 -> f
     16:16:void setByteOrder():87:87 -> f
-com.android.tools.r8.dex.VirtualFile -> com.android.tools.r8.internal.U40:
+com.android.tools.r8.dex.VirtualFile -> com.android.tools.r8.internal.q50:
     com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection indexedItems -> b
     com.android.tools.r8.graph.ObjectToOffsetMapping objectMapping -> g
     com.android.tools.r8.debuginfo.DebugRepresentation debugRepresentation -> f
@@ -18486,14 +18541,14 @@
     1:2:com.android.tools.r8.graph.ObjectToOffsetMapping getObjectMapping():190:191 -> k
     1:1:java.lang.String getPrimaryClassDescriptor():130:130 -> l
     1:1:boolean isEmpty():271:271 -> m
-com.android.tools.r8.dex.VirtualFile$Distributor -> com.android.tools.r8.internal.K40:
+com.android.tools.r8.dex.VirtualFile$Distributor -> com.android.tools.r8.internal.g50:
     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):283:283 -> <init>
     2:6:void <init>(com.android.tools.r8.dex.ApplicationWriter):281:285 -> <init>
     java.util.List run() -> a
-com.android.tools.r8.dex.VirtualFile$DistributorBase -> com.android.tools.r8.internal.L40:
+com.android.tools.r8.dex.VirtualFile$DistributorBase -> com.android.tools.r8.internal.h50:
     com.android.tools.r8.dex.VirtualFile mainDexFile -> f
     java.util.Set classes -> d
     com.android.tools.r8.utils.InternalOptions options -> g
@@ -18516,7 +18571,7 @@
     432:437:void lambda$fillForMainDexList$0(com.android.tools.r8.dex.VirtualFile,java.util.Set,com.android.tools.r8.graph.DexType):386:391 -> a
     438:461:void addFeatureSplitFiles(java.util.Map):429:452 -> a
     1:17:java.util.Map removeFeatureSplitClassesGetMapping():405:421 -> b
-com.android.tools.r8.dex.VirtualFile$FilePerInputClassDistributor -> com.android.tools.r8.internal.M40:
+com.android.tools.r8.dex.VirtualFile$FilePerInputClassDistributor -> com.android.tools.r8.internal.i50:
     java.util.Collection classes -> d
     boolean combineSyntheticClassesWithPrimaryClass -> e
     boolean $assertionsDisabled -> f
@@ -18530,14 +18585,14 @@
     10:10:java.util.List run():320 -> a
     11:11:java.util.List run():329:329 -> a
     12:33:java.util.List run():321:342 -> a
-com.android.tools.r8.dex.VirtualFile$FillFilesDistributor -> com.android.tools.r8.internal.N40:
+com.android.tools.r8.dex.VirtualFile$FillFilesDistributor -> com.android.tools.r8.internal.j50:
     boolean $assertionsDisabled -> j
     java.util.concurrent.ExecutorService executorService -> i
     1:1:void <clinit>():457:457 -> <clinit>
     1:2:void <init>(com.android.tools.r8.dex.ApplicationWriter,java.util.Collection,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):465:466 -> <init>
     1:43:java.util.List run():471:513 -> a
     1:1:int lambda$run$0(com.android.tools.r8.dex.VirtualFile):512:512 -> b
-com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction -> com.android.tools.r8.internal.O40:
+com.android.tools.r8.dex.VirtualFile$IndexedItemTransaction -> com.android.tools.r8.internal.k50:
     java.util.Set types -> g
     java.util.Set protos -> h
     java.util.Set strings -> i
@@ -18576,10 +18631,10 @@
     1:1:int getNumberOfFields():701:701 -> d
     1:1:int getNumberOfMethods():693:693 -> e
     1:2:boolean isEmpty():733:734 -> f
-com.android.tools.r8.dex.VirtualFile$MonoDexDistributor -> com.android.tools.r8.internal.P40:
+com.android.tools.r8.dex.VirtualFile$MonoDexDistributor -> com.android.tools.r8.internal.l50:
     1:1:void <init>(com.android.tools.r8.dex.ApplicationWriter,java.util.Collection,com.android.tools.r8.utils.InternalOptions):520:520 -> <init>
     1:14:java.util.List run():526:539 -> a
-com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator -> com.android.tools.r8.internal.R40:
+com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator -> com.android.tools.r8.internal.n50:
     java.util.Map originalNames -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -18742,14 +18797,14 @@
     171:171:void run():1010 -> b
     160:163:void com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator.addNonPackageClasses(com.android.tools.r8.dex.VirtualFile$VirtualFileCycler,java.util.List):1238:1241 -> b
     160:163:void run():1010 -> b
-com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning -> com.android.tools.r8.internal.Q40:
+com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning -> com.android.tools.r8.internal.m50:
     java.util.List nonStartupClasses -> b
     java.util.List startupClasses -> a
     1:3:void <init>(java.util.List,java.util.List):876:878 -> <init>
-    1:1:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    1:1:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     1:1:java.util.function.Predicate getStartupClassPredicate(com.android.tools.r8.graph.AppView):939 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    2:2:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     2:2:java.util.function.Predicate getStartupClassPredicate(com.android.tools.r8.graph.AppView):939 -> a
     3:8:java.util.function.Predicate getStartupClassPredicate(com.android.tools.r8.graph.AppView):940:945 -> a
     9:10:com.android.tools.r8.dex.VirtualFile$PackageSplitPopulator$PackageSplitClassPartioning create(java.util.Collection,com.android.tools.r8.graph.AppView,java.util.Map):887:888 -> a
@@ -18763,7 +18818,7 @@
     49:49:boolean lambda$getStartupClassPredicate$1(com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems,com.android.tools.r8.graph.DexProgramClass):946:946 -> a
     50:50:java.util.List getNonStartupClasses():954:954 -> a
     1:1:java.util.List getStartupClasses():950:950 -> b
-com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.internal.S40:
+com.android.tools.r8.dex.VirtualFile$VirtualFileCycler -> com.android.tools.r8.internal.o50:
     java.util.List filesForDistribution -> b
     java.util.List files -> a
     java.util.Iterator activeFiles -> f
@@ -18799,7 +18854,7 @@
     1:1:com.android.tools.r8.dex.VirtualFile next():793:793 -> e
     1:2:void reset():784:785 -> f
     1:1:void restart():829:829 -> g
-com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection -> com.android.tools.r8.internal.T40:
+com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection -> com.android.tools.r8.internal.p50:
     java.util.Set callSites -> g
     java.util.Set methodHandles -> h
     java.util.Set types -> c
@@ -18833,12 +18888,12 @@
     1:1:java.util.Set access$700(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):543:543 -> f
     1:1:java.util.Set access$800(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):543:543 -> g
     1:1:java.util.Set access$900(com.android.tools.r8.dex.VirtualFile$VirtualFileIndexedItemCollection):543:543 -> h
-com.android.tools.r8.dex.code.BytecodeStream -> com.android.tools.r8.internal.D6:
-com.android.tools.r8.dex.code.CfOrDexInstanceFieldRead -> com.android.tools.r8.internal.r8:
-com.android.tools.r8.dex.code.CfOrDexInstruction -> com.android.tools.r8.internal.s8:
+com.android.tools.r8.dex.code.BytecodeStream -> com.android.tools.r8.internal.F6:
+com.android.tools.r8.dex.code.CfOrDexInstanceFieldRead -> com.android.tools.r8.internal.u8:
+com.android.tools.r8.dex.code.CfOrDexInstruction -> com.android.tools.r8.internal.v8:
     com.android.tools.r8.cf.code.CfInstruction asCfInstruction() -> b
     com.android.tools.r8.dex.code.DexInstruction asDexInstruction() -> c
-com.android.tools.r8.dex.code.CfOrDexStaticFieldRead -> com.android.tools.r8.internal.t8:
+com.android.tools.r8.dex.code.CfOrDexStaticFieldRead -> com.android.tools.r8.internal.w8:
 com.android.tools.r8.dex.code.DexAddDouble -> com.android.tools.r8.dex.code.b:
     1:1:void <init>(int,com.android.tools.r8.dex.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
@@ -19139,7 +19194,7 @@
     8:8:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69 -> a
     9:9:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69 -> a
-    10:10:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    10:10:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     10:10:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69 -> a
     11:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79:79 -> a
@@ -19165,7 +19220,7 @@
     1:1:java.lang.String getName():39:39 -> t
     int getOpcode() -> v
     1:1:java.lang.String getSmaliName():44:44 -> z
-com.android.tools.r8.dex.code.DexCheckCast$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Ug:
+com.android.tools.r8.dex.code.DexCheckCast$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Yg:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:4:void com.android.tools.r8.dex.code.DexCheckCast$$InternalSyntheticOutline$166$e8d2a47e557109befa5a8275278ed1cdbb1cd28e10f4049dc9c65d8d1732f662$0.m(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.dex.IndexedItemCollection):0:3 -> a
@@ -19301,7 +19356,7 @@
     8:8:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69 -> a
     9:9:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69 -> a
-    10:10:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    10:10:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     10:10:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69 -> a
     11:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79:79 -> a
@@ -19470,10 +19525,10 @@
     85:85:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):84:84 -> a
     89:89:void internalSubSpecify(com.android.tools.r8.utils.structural.StructuralSpecification):40:40 -> a
     90:90:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49:49 -> a
-    91:91:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    91:91:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     91:91:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49 -> a
     92:92:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):94:94 -> a
-    93:93:int com.android.tools.r8.graph.DexString.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):278:278 -> a
+    93:93:int com.android.tools.r8.graph.DexString.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):282:282 -> a
     93:93:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):94 -> a
     94:94:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):98:98 -> a
     95:95:void com.android.tools.r8.dex.code.DexInstruction.writeFirst(int,java.nio.ShortBuffer):96:96 -> a
@@ -19831,7 +19886,7 @@
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
     10:10:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
-    11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     11:11:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     11:11:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
     12:12:com.android.tools.r8.graph.DexType getType():57:57 -> a
@@ -19876,7 +19931,7 @@
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
     10:10:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
-    11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     11:11:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     11:11:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
     12:12:com.android.tools.r8.graph.DexType getType():57:57 -> a
@@ -20311,14 +20366,14 @@
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52:52 -> a
     6:6:void com.android.tools.r8.dex.code.DexInstruction.write32BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):134:134 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
-    7:7:int com.android.tools.r8.graph.DexString.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):278:278 -> a
+    7:7:int com.android.tools.r8.graph.DexString.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):282:282 -> a
     7:7:void com.android.tools.r8.dex.code.DexInstruction.write32BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):134 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
     8:8:void com.android.tools.r8.dex.code.DexInstruction.write32BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):134:134 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
     9:9:int internalAcceptCompareTo(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.utils.structural.CompareToVisitor):62:62 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):77:77 -> a
-    11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     11:11:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):77 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":71,"2":72,"3":73}}
@@ -20764,7 +20819,7 @@
     7:7:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):64 -> a
     8:8:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     8:8:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):64 -> a
-    9:9:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    9:9:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     9:9:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):64 -> a
     10:10:void registerUse(com.android.tools.r8.graph.UseRegistry):73:73 -> a
@@ -21691,7 +21746,7 @@
     25:26:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:54 -> a
     27:28:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):164:165 -> a
     27:28:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54 -> a
-    29:29:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    29:29:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     29:29:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):165 -> a
     29:29:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54 -> a
     30:33:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):166:169 -> a
@@ -21723,7 +21778,7 @@
     4:5:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:54 -> a
     6:7:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):164:165 -> a
     6:7:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54 -> a
-    8:8:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    8:8:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     8:8:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):165 -> a
     8:8:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54 -> a
     9:12:void com.android.tools.r8.graph.DexCallSite.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):166:169 -> a
@@ -22746,7 +22801,7 @@
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54 -> a
     10:10:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54 -> a
-    11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    11:11:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     11:11:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     11:11:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54 -> a
     12:12:com.android.tools.r8.graph.DexType getType():63:63 -> a
@@ -22792,7 +22847,7 @@
     8:8:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60 -> a
     9:9:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60 -> a
-    10:10:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    10:10:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     10:10:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60 -> a
     11:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):70:70 -> a
@@ -23652,7 +23707,7 @@
     71:92:void splitNonClassResources(com.android.tools.r8.dexsplitter.DexSplitter$Options,com.android.tools.r8.utils.FeatureClassMapping):329:350 -> run
     71:92:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):322 -> run
     93:93:void run(com.android.tools.r8.dexsplitter.DexSplitter$Options):300:300 -> run
-com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar -> com.android.tools.r8.internal.Jh:
+com.android.tools.r8.dexsplitter.DexSplitter$FeatureJar -> com.android.tools.r8.internal.Nh:
     java.lang.String jar -> a
     java.lang.String outputName -> b
     1:3:void <init>(java.lang.String,java.lang.String):49:51 -> <init>
@@ -23818,32 +23873,32 @@
     3:3:boolean validate():55:55 -> c
     3:3:com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl build():48 -> c
     4:4:com.android.tools.r8.diagnostic.internal.DefinitionMethodContextImpl build():49:49 -> c
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.VG:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl -> com.android.tools.r8.internal.cH:
     com.android.tools.r8.references.ClassReference classReference -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.util.Collection,com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1):13:13 -> <init>
     2:3:void <init>(com.android.tools.r8.references.ClassReference,java.util.Collection):19:20 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder builder():24:24 -> a
     1:1:com.android.tools.r8.references.ClassReference getClassReference():29:29 -> getClassReference
-com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.internal.UG:
+com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder -> com.android.tools.r8.internal.bH:
     com.android.tools.r8.references.ClassReference classReference -> b
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$1):32:32 -> <init>
     2:2:void <init>():36:36 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
     1:1:com.android.tools.r8.diagnostic.internal.MissingClassInfoImpl$Builder setClass(com.android.tools.r8.references.ClassReference):39:39 -> a
     1:1:com.android.tools.r8.diagnostic.MissingDefinitionInfo build():44:44 -> b
-com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase -> com.android.tools.r8.internal.ZG:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase -> com.android.tools.r8.internal.gH:
     java.util.Collection referencedFromContexts -> a
     1:2:void <init>(java.util.Collection):16:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():22:24 -> getDiagnosticMessage
     1:1:java.util.Collection getReferencedFromContexts():29:29 -> getReferencedFromContexts
-com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder -> com.android.tools.r8.internal.YG:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder -> com.android.tools.r8.internal.fH:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder referencedFromContextsBuilder -> a
     1:1:void <init>():37:37 -> <init>
     2:2:void <init>():35:35 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
     1:2:com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder addReferencedFromContext(com.android.tools.r8.diagnostic.DefinitionContext):40:41 -> a
     3:4:com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder addReferencedFromContexts(java.lang.Iterable):45:46 -> a
-com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils -> com.android.tools.r8.internal.aH:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils -> com.android.tools.r8.internal.hH:
     boolean $assertionsDisabled -> b
     java.util.Comparator COMPARATOR -> a
     1:3:void <clinit>():26:28 -> <clinit>
@@ -23871,7 +23926,8 @@
     48:48:int com.android.tools.r8.utils.MethodReferenceUtils.compare(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.FieldReference):63 -> a
     48:48:int lambda$static$0(com.android.tools.r8.diagnostic.MissingDefinitionInfo,com.android.tools.r8.diagnostic.MissingDefinitionInfo):62 -> a
     49:49:int lambda$static$0(com.android.tools.r8.diagnostic.MissingDefinitionInfo,com.android.tools.r8.diagnostic.MissingDefinitionInfo):66:66 -> a
-    50:50:int lambda$static$0(com.android.tools.r8.diagnostic.MissingDefinitionInfo,com.android.tools.r8.diagnostic.MissingDefinitionInfo):65:65 -> a
+    50:50:int com.android.tools.r8.utils.MethodReferenceUtils.compare(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):67:67 -> a
+    50:50:int lambda$static$0(com.android.tools.r8.diagnostic.MissingDefinitionInfo,com.android.tools.r8.diagnostic.MissingDefinitionInfo):65 -> a
     51:51:java.util.Comparator getComparator():85:85 -> a
     52:52:void writeDiagnosticMessage(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):90:90 -> a
     53:59:void com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoUtils.accept(com.android.tools.r8.diagnostic.MissingDefinitionInfo,java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):74:80 -> a
@@ -23909,7 +23965,7 @@
     1:23:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):110:132 -> b
     24:28:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):131:135 -> b
     29:32:void writeReferencedFromSuffix(java.lang.StringBuilder,com.android.tools.r8.diagnostic.MissingDefinitionInfo):134:137 -> b
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.internal.cH:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl -> com.android.tools.r8.internal.jH:
     java.util.Collection missingDefinitions -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():17:17 -> <clinit>
@@ -23926,40 +23982,40 @@
     1:3:java.util.Collection getMissingDefinitions():32 -> getMissingDefinitions
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():51:51 -> getPosition
-com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.internal.bH:
+com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder -> com.android.tools.r8.internal.iH:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder missingDefinitionsBuilder -> a
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$1):75:75 -> <init>
     2:2:void <init>():80:80 -> <init>
     3:3:void <init>():78:78 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingDefinitionsDiagnosticImpl$Builder addMissingDefinitionInfo(com.android.tools.r8.diagnostic.MissingDefinitionInfo):83:83 -> a
     2:2:com.android.tools.r8.diagnostic.MissingDefinitionsDiagnostic build():88:88 -> a
-com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl -> com.android.tools.r8.internal.eH:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl -> com.android.tools.r8.internal.lH:
     com.android.tools.r8.references.FieldReference fieldReference -> b
     1:1:void <init>(com.android.tools.r8.references.FieldReference,java.util.Collection,com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$1):13:13 -> <init>
     2:3:void <init>(com.android.tools.r8.references.FieldReference,java.util.Collection):19:20 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder builder():24:24 -> a
     1:1:com.android.tools.r8.references.FieldReference getFieldReference():29:29 -> getFieldReference
-com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder -> com.android.tools.r8.internal.dH:
+com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder -> com.android.tools.r8.internal.kH:
     com.android.tools.r8.references.FieldReference fieldReference -> b
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$1):32:32 -> <init>
     2:2:void <init>():36:36 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
     1:1:com.android.tools.r8.diagnostic.internal.MissingFieldInfoImpl$Builder setField(com.android.tools.r8.references.FieldReference):39:39 -> a
     1:1:com.android.tools.r8.diagnostic.MissingDefinitionInfo build():44:44 -> b
-com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl -> com.android.tools.r8.internal.hH:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl -> com.android.tools.r8.internal.oH:
     com.android.tools.r8.references.MethodReference methodReference -> b
     1:1:void <init>(com.android.tools.r8.references.MethodReference,java.util.Collection,com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$1):13:13 -> <init>
     2:3:void <init>(com.android.tools.r8.references.MethodReference,java.util.Collection):19:20 -> <init>
     1:1:com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder builder():24:24 -> a
     1:1:com.android.tools.r8.references.MethodReference getMethodReference():29:29 -> getMethodReference
-com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder -> com.android.tools.r8.internal.gH:
+com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder -> com.android.tools.r8.internal.nH:
     com.android.tools.r8.references.MethodReference methodReference -> b
     1:1:void <init>(com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$1):32:32 -> <init>
     2:2:void <init>():36:36 -> <init>
     com.android.tools.r8.diagnostic.internal.MissingDefinitionInfoBase$Builder self() -> a
     1:1:com.android.tools.r8.diagnostic.internal.MissingMethodInfoImpl$Builder setMethod(com.android.tools.r8.references.MethodReference):39:39 -> a
     1:1:com.android.tools.r8.diagnostic.MissingDefinitionInfo build():44:44 -> b
-com.android.tools.r8.dump.CompilerDump -> com.android.tools.r8.internal.Xc:
+com.android.tools.r8.dump.CompilerDump -> com.android.tools.r8.internal.ad:
     java.nio.file.Path directory -> a
     1:2:void <init>(java.nio.file.Path):24:25 -> <init>
     1:2:com.android.tools.r8.dump.CompilerDump fromArchive(java.nio.file.Path,java.nio.file.Path):20:21 -> a
@@ -23974,7 +24030,7 @@
     1:1:java.nio.file.Path getLibraryArchive():37:37 -> b
     1:1:java.nio.file.Path getProgramArchive():29:29 -> c
     1:1:java.nio.file.Path getProguardConfigFile():45:45 -> d
-com.android.tools.r8.dump.DumpOptions -> com.android.tools.r8.internal.hi:
+com.android.tools.r8.dump.DumpOptions -> com.android.tools.r8.internal.li:
     java.util.Optional intermediate -> g
     java.util.Optional includeDataResources -> h
     java.util.List mainDexKeepRules -> o
@@ -24080,7 +24136,7 @@
     218:236:void parse(java.lang.String,com.android.tools.r8.dump.DumpOptions$Builder):140 -> a
     237:237:void com.android.tools.r8.dump.DumpOptions.parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):171:171 -> a
     237:237:void parse(java.lang.String,com.android.tools.r8.dump.DumpOptions$Builder):140 -> a
-    238:238:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.utils.InternalOptions$DesugarState.valueOf(java.lang.String):127:127 -> a
+    238:238:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.utils.InternalOptions$DesugarState.valueOf(java.lang.String):128:128 -> a
     238:238:void com.android.tools.r8.dump.DumpOptions.parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):168 -> a
     238:238:void parse(java.lang.String,com.android.tools.r8.dump.DumpOptions$Builder):140 -> a
     239:239:void com.android.tools.r8.dump.DumpOptions.parseKeyValue(com.android.tools.r8.dump.DumpOptions$Builder,java.lang.String,java.lang.String):168:168 -> a
@@ -24129,7 +24185,7 @@
     1:1:int getMinApi():207:207 -> f
     1:1:java.lang.String getParsedProguardConfiguration():239:239 -> g
     1:1:boolean hasMainDexKeepRules():243:243 -> h
-com.android.tools.r8.dump.DumpOptions$Builder -> com.android.tools.r8.internal.hi$a:
+com.android.tools.r8.dump.DumpOptions$Builder -> com.android.tools.r8.internal.li$a:
     java.util.Optional intermediate -> g
     java.util.Optional includeDataResources -> h
     java.util.List mainDexKeepRules -> o
@@ -24171,7 +24227,7 @@
     1:1:com.android.tools.r8.dump.DumpOptions$Builder setMinification(boolean):335:335 -> c
     1:1:com.android.tools.r8.dump.DumpOptions$Builder setOptimizeMultidexForLinearAlloc(boolean):305:305 -> d
     1:1:com.android.tools.r8.dump.DumpOptions$Builder setTreeShaking(boolean):340:340 -> e
-com.android.tools.r8.dump.ProguardConfigSanitizer -> com.android.tools.r8.internal.AP:
+com.android.tools.r8.dump.ProguardConfigSanitizer -> com.android.tools.r8.internal.SP:
     java.lang.Runnable dontOptimizeCallback -> e
     java.lang.Runnable dontShrinkCallback -> d
     java.util.function.Consumer printDirectivesCallback -> c
@@ -24230,6 +24286,31 @@
     3:3:com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder setOrigin(com.android.tools.r8.origin.Origin):78:78 -> a
     4:4:com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic$Builder setPosition(com.android.tools.r8.position.Position):83:83 -> a
     5:5:com.android.tools.r8.errors.AssumeNoSideEffectsRuleForObjectMembersDiagnostic build():88:88 -> a
+com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic -> com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic:
+    com.android.tools.r8.graph.DexString fieldName -> c
+    com.android.tools.r8.position.Position position -> e
+    com.android.tools.r8.origin.Origin origin -> d
+    com.android.tools.r8.graph.DexType fieldHolder -> b
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$1):14:14 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):22:26 -> <init>
+    1:1:java.lang.String getDiagnosticMessage():0:0 -> getDiagnosticMessage
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":44,"2":45,"3":46}}
+    44:44:java.lang.String getDiagnosticMessage():41:41 -> getDiagnosticMessage
+    45:45:java.lang.String getDiagnosticMessage():41:41 -> getDiagnosticMessage
+    46:46:java.lang.String getDiagnosticMessage():41:41 -> getDiagnosticMessage
+    42:43:java.lang.String getDiagnosticMessage():41:42 -> getDiagnosticMessage
+    1:1:com.android.tools.r8.origin.Origin getOrigin():31:31 -> getOrigin
+    1:1:com.android.tools.r8.position.Position getPosition():36:36 -> getPosition
+com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder -> com.android.tools.r8.errors.b:
+    com.android.tools.r8.graph.DexString fieldName -> b
+    com.android.tools.r8.origin.Origin origin -> c
+    com.android.tools.r8.position.Position position -> d
+    com.android.tools.r8.graph.DexType fieldHolder -> a
+    1:1:void <init>():56:56 -> <init>
+    1:2:com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder setField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):59:60 -> a
+    3:3:com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder setOrigin(com.android.tools.r8.origin.Origin):65:65 -> a
+    4:4:com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic$Builder setPosition(com.android.tools.r8.position.Position):70:70 -> a
+    5:5:com.android.tools.r8.errors.AssumeValuesMissingStaticFieldDiagnostic build():75:75 -> a
 com.android.tools.r8.errors.CheckDiscardDiagnostic -> com.android.tools.r8.errors.CheckDiscardDiagnostic:
     java.util.List messages -> b
     1:1:void <init>(java.util.List,com.android.tools.r8.errors.CheckDiscardDiagnostic$1):19:19 -> <init>
@@ -24238,7 +24319,7 @@
     1:11:java.lang.String getDiagnosticMessage():66:76 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():55:55 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():61:61 -> getPosition
-com.android.tools.r8.errors.CheckDiscardDiagnostic$Builder -> com.android.tools.r8.errors.b:
+com.android.tools.r8.errors.CheckDiscardDiagnostic$Builder -> com.android.tools.r8.errors.c:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder messagesBuilder -> a
     1:2:void <init>():23:24 -> <init>
     1:4:com.android.tools.r8.errors.CheckDiscardDiagnostic$Builder addFailedItems(java.util.List,com.android.tools.r8.shaking.GraphReporter,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer):30:33 -> a
@@ -24251,6 +24332,24 @@
     44:46:com.android.tools.r8.errors.CheckDiscardDiagnostic$Builder addFailedItems(java.util.List,com.android.tools.r8.shaking.GraphReporter,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer):36:38 -> a
     47:47:com.android.tools.r8.errors.CheckDiscardDiagnostic$Builder addFailedItems(java.util.List,com.android.tools.r8.shaking.GraphReporter,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer):34:34 -> a
     51:51:com.android.tools.r8.errors.CheckDiscardDiagnostic build():44:44 -> a
+com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic -> com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic:
+    java.util.List messages -> b
+    1:2:void <init>(java.util.List):22:23 -> <init>
+    1:1:com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic$Builder builder():27:27 -> builder
+    1:6:java.lang.String getDiagnosticMessage():44:49 -> getDiagnosticMessage
+    1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> getOrigin
+    1:1:com.android.tools.r8.position.Position getPosition():39:39 -> getPosition
+com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic$Builder -> com.android.tools.r8.errors.d:
+    com.android.tools.r8.com.google.common.collect.ImmutableList$Builder messagesBuilder -> a
+    1:3:void <init>():52:54 -> <init>
+    1:3:com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic$Builder addFailedEnums(java.util.List):57:59 -> a
+    4:4:com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic$Builder addFailedEnums(java.util.List):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":64,"2":65,"3":66}}
+    64:64:com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic$Builder addFailedEnums(java.util.List):59:59 -> a
+    65:65:com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic$Builder addFailedEnums(java.util.List):59:59 -> a
+    66:66:com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic$Builder addFailedEnums(java.util.List):59:59 -> a
+    63:63:com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic$Builder addFailedEnums(java.util.List):59:59 -> a
+    67:67:com.android.tools.r8.errors.CheckEnumUnboxedDiagnostic build():65:65 -> a
 com.android.tools.r8.errors.ClassFileOverflowDiagnostic -> com.android.tools.r8.errors.ClassFileOverflowDiagnostic:
     com.android.tools.r8.origin.Origin origin -> b
     1:2:void <init>(com.android.tools.r8.origin.Origin):16:17 -> <init>
@@ -24269,7 +24368,7 @@
     50:50:java.lang.String getDiagnosticMessage():42:42 -> getDiagnosticMessage
     43:47: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.Wc:
+com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.Zc:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     1:1:void <init>(java.lang.String):22:22 -> <init>
@@ -24291,14 +24390,14 @@
     40:40:java.lang.String getDiagnosticMessage():33:33 -> getDiagnosticMessage
     41:41:java.lang.String getDiagnosticMessage():33:33 -> getDiagnosticMessage
     34:38:java.lang.String getDiagnosticMessage():33:37 -> getDiagnosticMessage
-com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.wf:
+com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.Af:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> c
     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.ig:
+com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.mg:
     java.util.Set markers -> c
     java.util.Set desugaredLibraryIdentifiers -> b
     1:3:void <init>(java.util.Set,java.util.Set):20:22 -> <init>
@@ -24359,14 +24458,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.uv:
+com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.Av:
     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.Tv:
+com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.Zv:
     1:1:void <init>(java.lang.String):9:9 -> <init>
-com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.Uv:
+com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.aw:
     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
@@ -24385,10 +24484,10 @@
     60:70:java.lang.String getDiagnosticMessage():59: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.Zv:
+com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.fw:
     1:1:void <init>():9:9 -> <init>
     1:1:java.lang.String getDiagnosticMessage():13:13 -> getDiagnosticMessage
-com.android.tools.r8.errors.MissingGlobalSyntheticsConsumerDiagnostic -> com.android.tools.r8.internal.fH:
+com.android.tools.r8.errors.MissingGlobalSyntheticsConsumerDiagnostic -> com.android.tools.r8.internal.mH:
     java.lang.String generatingReason -> b
     1:2:void <init>(java.lang.String):13:14 -> <init>
     1:1:java.lang.String getDiagnosticMessage():0:0 -> getDiagnosticMessage
@@ -24414,24 +24513,24 @@
     1:1:java.lang.String getDiagnosticMessage():36:36 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():26:26 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():31:31 -> getPosition
-com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.VO:
+com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.nP:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> c
     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.VY:
+com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.qZ:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> c
     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.j30:
+com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.F30:
     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.F30:
+com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.b40:
     1:1:void <init>():19:19 -> <init>
     2:2:void <init>(java.lang.String):23:23 -> <init>
     3:3:void <init>(java.lang.Throwable):27:27 -> <init>
@@ -24441,21 +24540,21 @@
     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.dontwarn.DontWarnConfiguration -> com.android.tools.r8.internal.ai:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration -> com.android.tools.r8.internal.ei:
     1:1:void <init>():12:12 -> <init>
     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):15:17 -> a
     4:4:com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.empty():23:23 -> a
     4:4:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration create(com.android.tools.r8.shaking.ProguardConfiguration):19 -> a
-com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness -> com.android.tools.r8.internal.Zh:
+com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness -> com.android.tools.r8.internal.di:
     1:1:void <init>(com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$1):36:36 -> <init>
     2:2:void <init>():38:38 -> <init>
-com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration -> com.android.tools.r8.internal.vi:
+com.android.tools.r8.errors.dontwarn.EmptyDontWarnConfiguration -> com.android.tools.r8.internal.zi:
     1:1:void <init>():10:10 -> <init>
     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.pJ:
+com.android.tools.r8.errors.dontwarn.NonEmptyDontWarnConfiguration -> com.android.tools.r8.internal.wJ:
     java.util.List dontWarnPatterns -> a
     java.util.Map matchedDontWarnPatterns -> b
     boolean $assertionsDisabled -> c
@@ -24527,7 +24626,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.Qm:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.Vm:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo UNKNOWN -> b
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind kind -> a
     boolean $assertionsDisabled -> c
@@ -24568,10 +24667,10 @@
     101:101:java.lang.String toString():98:98 -> toString
     102:102:java.lang.String toString():98:98 -> toString
     99:99:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$1 -> com.android.tools.r8.internal.Pm:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$1 -> com.android.tools.r8.internal.Um:
     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.Qm$a:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.Vm$a:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind[] $VALUES -> t
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReflectiveUseFrom -> m
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReferencedFrom -> l
@@ -24634,7 +24733,7 @@
     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.experimental.startup.EmptyStartupOrder -> com.android.tools.r8.internal.Ii:
+com.android.tools.r8.experimental.startup.EmptyStartupOrder -> com.android.tools.r8.internal.Mi:
     1:1:void <init>():16:16 -> <init>
     boolean contains(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.experimental.startup.StartupOrder rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
@@ -24642,7 +24741,7 @@
     com.android.tools.r8.experimental.startup.StartupOrder withoutPrunedItems(com.android.tools.r8.graph.PrunedItems) -> a
     1:1:java.util.Collection getClasses():25:25 -> b
     boolean isEmpty() -> c
-com.android.tools.r8.experimental.startup.NonEmptyStartupOrder -> com.android.tools.r8.internal.wJ:
+com.android.tools.r8.experimental.startup.NonEmptyStartupOrder -> com.android.tools.r8.internal.DJ:
     boolean $assertionsDisabled -> b
     java.util.LinkedHashSet startupClasses -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -24685,7 +24784,7 @@
     2:2:java.util.List lambda$toStartupOrderForWriting$0(com.android.tools.r8.graph.DexType):63:63 -> b
     3:3:void addParentClasses(com.android.tools.r8.graph.DexProgramClass,java.util.LinkedHashSet,java.util.Map,com.android.tools.r8.graph.AppView):125:125 -> b
     boolean isEmpty() -> c
-com.android.tools.r8.experimental.startup.StartupConfiguration -> com.android.tools.r8.internal.AY:
+com.android.tools.r8.experimental.startup.StartupConfiguration -> com.android.tools.r8.internal.VY:
     java.util.List startupClasses -> a
     1:2:void <init>(java.util.List,java.util.List):27:28 -> <init>
     1:3:com.android.tools.r8.experimental.startup.StartupConfiguration createStartupConfiguration(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):49:51 -> a
@@ -24750,7 +24849,7 @@
     60:60:com.android.tools.r8.experimental.startup.StartupConfiguration createStartupConfiguration(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):51 -> a
     98:98:java.util.List getStartupClasses():151:151 -> a
     1:1:boolean hasStartupClasses():147:147 -> b
-com.android.tools.r8.experimental.startup.StartupInstrumentation -> com.android.tools.r8.internal.BY:
+com.android.tools.r8.experimental.startup.StartupInstrumentation -> com.android.tools.r8.internal.WY:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.experimental.startup.StartupOptions options -> c
@@ -24777,25 +24876,25 @@
     47:73:void internalInstrumentClass(com.android.tools.r8.graph.DexProgramClass):61 -> b
     74:74:void com.android.tools.r8.experimental.startup.StartupInstrumentation.instrumentClassInitializer(com.android.tools.r8.graph.ProgramMethod):114:114 -> b
     74:74:void internalInstrumentClass(com.android.tools.r8.graph.DexProgramClass):61 -> b
-com.android.tools.r8.experimental.startup.StartupOptions -> com.android.tools.r8.internal.EY:
+com.android.tools.r8.experimental.startup.StartupOptions -> com.android.tools.r8.internal.ZY:
     com.android.tools.r8.experimental.startup.StartupConfiguration startupConfiguration -> e
     boolean enableMinimalStartupDex -> a
     boolean enableStartupCompletenessCheckForTesting -> b
     boolean enableStartupInstrumentation -> c
     java.lang.String startupInstrumentationTag -> d
-    1:10:void <init>():10:19 -> <init>
-    1:1:com.android.tools.r8.experimental.startup.StartupConfiguration getStartupConfiguration():64:64 -> a
-    2:2:void setStartupConfiguration(com.android.tools.r8.experimental.startup.StartupConfiguration):68:68 -> a
-    1:1:java.lang.String getStartupInstrumentationTag():29:29 -> b
-    1:1:boolean hasStartupConfiguration():60:60 -> c
-    1:1:boolean hasStartupInstrumentationTag():25:25 -> d
-    1:1:boolean isMinimalStartupDexEnabled():33:33 -> e
-    1:1:boolean isStartupCompletenessCheckForTesting():51:51 -> f
-    1:1:boolean isStartupInstrumentationEnabled():42:42 -> g
-    1:1:com.android.tools.r8.experimental.startup.StartupOptions setEnableMinimalStartupDex():37:37 -> h
-    1:1:com.android.tools.r8.experimental.startup.StartupOptions setEnableStartupCompletenessCheckForTesting():55:55 -> i
-    1:1:com.android.tools.r8.experimental.startup.StartupOptions setEnableStartupInstrumentation():46:46 -> j
-com.android.tools.r8.experimental.startup.StartupOrder -> com.android.tools.r8.internal.FY:
+    1:12:void <init>():10:21 -> <init>
+    1:1:com.android.tools.r8.experimental.startup.StartupConfiguration getStartupConfiguration():65:65 -> a
+    2:2:void setStartupConfiguration(com.android.tools.r8.experimental.startup.StartupConfiguration):69:69 -> a
+    1:1:java.lang.String getStartupInstrumentationTag():30:30 -> b
+    1:1:boolean hasStartupConfiguration():61:61 -> c
+    1:1:boolean hasStartupInstrumentationTag():26:26 -> d
+    1:1:boolean isMinimalStartupDexEnabled():34:34 -> e
+    1:1:boolean isStartupCompletenessCheckForTesting():52:52 -> f
+    1:1:boolean isStartupInstrumentationEnabled():43:43 -> g
+    1:1:com.android.tools.r8.experimental.startup.StartupOptions setEnableMinimalStartupDex():38:38 -> h
+    1:1:com.android.tools.r8.experimental.startup.StartupOptions setEnableStartupCompletenessCheckForTesting():56:56 -> i
+    1:1:com.android.tools.r8.experimental.startup.StartupOptions setEnableStartupInstrumentation():47:47 -> j
+com.android.tools.r8.experimental.startup.StartupOrder -> com.android.tools.r8.internal.aZ:
     1:1:void <init>():17:17 -> <init>
     boolean contains(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.experimental.startup.StartupOrder rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
@@ -24805,7 +24904,7 @@
     10:10:com.android.tools.r8.experimental.startup.StartupOrder empty():32:32 -> a
     java.util.Collection getClasses() -> b
     boolean isEmpty() -> c
-com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.nb:
+com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.qb:
     java.util.Map classToFeatureSplitMap -> b
     java.util.Map representativeStringsForFeatureSplit -> c
     com.android.tools.r8.FeatureSplit baseStartup -> a
@@ -24826,7 +24925,7 @@
     271:276:com.android.tools.r8.features.ClassToFeatureSplitMap createInitialClassToFeatureSplitMap(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.features.FeatureSplitConfiguration,com.android.tools.r8.experimental.startup.StartupConfiguration,com.android.tools.r8.utils.Reporter):108:113 -> a
     277:291:int compareFeatureSplits(com.android.tools.r8.FeatureSplit,com.android.tools.r8.FeatureSplit):118:132 -> a
     292:293:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.synthesis.SyntheticItems):145:146 -> a
-    294:294:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    294:294:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     294:294:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
     294:294:java.util.Map getFeatureSplitClasses(java.util.Set,com.android.tools.r8.synthesis.SyntheticItems):147 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
@@ -24840,12 +24939,12 @@
     329:330:void lambda$withoutPrunedItems$2(com.android.tools.r8.graph.PrunedItems,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):228:229 -> a
     1:1:com.android.tools.r8.FeatureSplit getBaseStartup():140:140 -> b
     1:1:boolean isEmpty():175:175 -> c
-com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.fk:
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.kk:
     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.ek:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.jk:
     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>
@@ -24946,7 +25045,7 @@
     2:2: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):22:22 -> a
     3:9:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):31:37 -> a
     10:10:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):36:36 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     11:11:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.Definition,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.synthesis.SyntheticItems):36 -> a
@@ -25066,10 +25165,10 @@
     21:22:com.android.tools.r8.graph.DexItemFactory dexItemFactory():118:119 -> a
     23:24:void forEachMethod(java.util.function.Consumer):143:144 -> a
     25:28:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):217:220 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):572:572 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):586:586 -> a
     29:29:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):220 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    30:30:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):572:572 -> a
+    30:30:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):586:586 -> a
     30:30:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):220 -> a
     31:31:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):221:221 -> a
     32:33: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):253:254 -> a
@@ -25080,10 +25179,10 @@
     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):260 -> a
     1:2:com.android.tools.r8.graph.DexApplication app():112:113 -> b
     3:6:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):198:201 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):572:572 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):586:586 -> b
     7:7:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):201 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):572:572 -> b
+    8:8:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):586:586 -> b
     8:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):201 -> b
     9:9:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):202:202 -> b
     1:1:boolean checkIfObsolete():107:107 -> c
@@ -25286,7 +25385,7 @@
     78:80:com.android.tools.r8.graph.MethodResolutionResult unsafeResolveMethodDueToDexFormat(com.android.tools.r8.graph.DexMethod):781:783 -> f
     81:83:com.android.tools.r8.graph.MethodResolutionResult unsafeResolveMethodDueToDexFormat(com.android.tools.r8.graph.DexMethod):782:784 -> f
     1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):371:371 -> g
-    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):822:826 -> g
+    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):836:840 -> g
     2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):372 -> g
     7:9:com.android.tools.r8.graph.MethodResolutionResult unsafeResolveMethodDueToDexFormatLegacy(com.android.tools.r8.graph.DexMethod):670:672 -> g
     1:1:boolean hasClassHierarchy():160:160 -> h
@@ -25440,342 +25539,359 @@
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
 com.android.tools.r8.graph.AppView -> com.android.tools.r8.graph.g:
-    com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses -> y
-    com.android.tools.r8.graph.GraphLens graphLens -> g
-    com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> e
-    com.android.tools.r8.shaking.ProguardCompatibilityActions proguardCompatibilityActions -> j
-    com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator argumentPropagator -> s
-    com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMemberOptimizer -> t
-    com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet mainDexRootSet -> l
-    java.util.function.Predicate classesEscapingIntoLibrary -> w
-    com.android.tools.r8.androidapi.ComputedApiLevel computedMinApiLevel -> J
-    com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods initializedClassesInInstanceMethods -> x
-    java.util.Map sourceDebugExtensions -> D
-    com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums -> A
+    com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses -> A
+    com.android.tools.r8.ir.desugar.TypeRewriter typeRewriter -> r
+    com.android.tools.r8.graph.InitClassLens initClassLens -> i
+    com.android.tools.r8.graph.GraphLens codeLens -> g
+    com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> n
+    com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection openClosedInterfacesCollection -> C
+    com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> o
+    boolean allCodeProcessed -> w
+    com.android.tools.r8.naming.NamingLens namingLens -> j
+    java.util.Set alreadyLibraryDesugared -> H
+    com.android.tools.r8.androidapi.ComputedApiLevel computedMinApiLevel -> L
+    com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory -> q
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring -> b
-    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory -> o
-    com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection libraryMethodSideEffectModelCollection -> r
-    java.util.Set alreadyLibraryDesugared -> F
-    com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> I
-    com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> n
-    com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker -> u
-    java.lang.Thread mainThread -> H
-    com.android.tools.r8.graph.GraphLens codeLens -> f
-    com.android.tools.r8.graph.InitClassLens initClassLens -> h
-    com.android.tools.r8.ir.desugar.TypeRewriter typeRewriter -> q
-    boolean $assertionsDisabled -> K
-    com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> m
-    boolean allCodeProcessed -> v
-    com.android.tools.r8.naming.NamingLens namingLens -> i
-    com.android.tools.r8.contexts.CompilationContext context -> G
-    com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory -> p
+    java.util.Set cfByteCodePassThrough -> D
+    com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> K
+    com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet -> l
+    com.android.tools.r8.shaking.AssumeInfoCollection assumeInfoCollection -> d
+    com.android.tools.r8.errors.dontwarn.DontWarnConfiguration dontWarnConfiguration -> e
+    java.util.Map sourceFileForPrunedTypes -> F
+    java.lang.Thread mainThread -> J
+    boolean $assertionsDisabled -> M
+    com.android.tools.r8.graph.GraphLens graphLens -> h
+    com.android.tools.r8.graph.AppView$WholeProgramOptimizations wholeProgramOptimizations -> f
+    com.android.tools.r8.shaking.ProguardCompatibilityActions proguardCompatibilityActions -> k
+    com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses -> z
+    com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMemberOptimizer -> u
+    com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet mainDexRootSet -> m
+    java.util.function.Predicate classesEscapingIntoLibrary -> x
+    com.android.tools.r8.naming.SeedMapper applyMappingSeedMapper -> G
+    com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods initializedClassesInInstanceMethods -> y
     com.android.tools.r8.graph.AppServices appServices -> c
-    com.android.tools.r8.naming.SeedMapper applyMappingSeedMapper -> E
-    java.util.Set cfByteCodePassThrough -> C
-    com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection openClosedInterfacesCollection -> B
-    com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet -> k
-    com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses -> z
+    com.android.tools.r8.contexts.CompilationContext context -> I
+    com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory -> p
+    com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator argumentPropagator -> t
+    com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums -> B
+    com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection libraryMethodSideEffectModelCollection -> s
     com.android.tools.r8.graph.AppInfo appInfo -> a
-    com.android.tools.r8.errors.dontwarn.DontWarnConfiguration dontWarnConfiguration -> d
-    1:1:void <clinit>():67:67 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):142:142 -> <init>
-    2:94:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):79:171 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLens graphLens():477:477 -> A
-    1:1:boolean hasCfByteCodePassThroughMethods():742:742 -> B
-    1:1:boolean hasMainDexRootSet():560:560 -> C
-    1:1:boolean hasProguardCompatibilityActions():592:592 -> D
-    1:1:boolean hasUnboxedEnums():667:667 -> E
-    1:1:boolean hasVerticallyMergedClasses():640:640 -> F
-    1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():625:625 -> G
-    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():502:502 -> H
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():236:236 -> I
-    1:1:boolean isAllCodeProcessed():293:293 -> J
-    1:1:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration lambda$new$1():152:152 -> K
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection lambda$new$2():164:164 -> L
-    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():167:167 -> M
-    2:8:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):58:64 -> M
-    2:8:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():167 -> M
-    9:9:com.android.tools.r8.utils.Reporter reporter():535:535 -> M
-    9:9:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):66 -> M
-    9:9:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():167 -> M
-    10:14:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):66:70 -> M
-    10:14:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():167 -> M
-    15:15:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1711:1711 -> M
-    15:15:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):70 -> M
+    java.util.Map sourceDebugExtensions -> E
+    com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker -> v
+    1:1:void <clinit>():69:69 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):146:146 -> <init>
+    2:98:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):79:175 -> <init>
+    1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():392:392 -> A
+    1:1:com.android.tools.r8.graph.GraphLens graphLens():489:489 -> B
+    1:1:boolean hasCfByteCodePassThroughMethods():754:754 -> C
+    1:1:boolean hasMainDexRootSet():572:572 -> D
+    1:1:boolean hasProguardCompatibilityActions():604:604 -> E
+    1:1:boolean hasUnboxedEnums():679:679 -> F
+    1:1:boolean hasVerticallyMergedClasses():652:652 -> G
+    1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():637:637 -> H
+    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():514:514 -> I
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():240:240 -> J
+    1:1:boolean isAllCodeProcessed():297:297 -> K
+    1:1:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration lambda$new$1():156:156 -> L
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection lambda$new$2():168:168 -> M
+    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():171:171 -> N
+    2:8:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):58:64 -> N
+    2:8:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():171 -> N
+    9:9:com.android.tools.r8.utils.Reporter reporter():547:547 -> N
+    9:9:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):66 -> N
+    9:9:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():171 -> N
+    10:14:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):66:70 -> N
+    10:14:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():171 -> N
+    15:15:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1687:1687 -> N
+    15:15:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):70 -> N
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:15:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():167 -> M
-    16:19:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1712:1715 -> M
-    16:19:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):70 -> M
-    16:19:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():167 -> M
-    20:20:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):74:74 -> M
-    20:20:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():167 -> M
-    1:2:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.create(com.android.tools.r8.graph.AppView):48:49 -> N
-    1:2:com.android.tools.r8.androidapi.AndroidApiLevelCompute lambda$new$5():169 -> N
-    3:3:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.noAndroidApiLevelCompute():54:54 -> N
-    3:3:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.create(com.android.tools.r8.graph.AppView):50 -> N
-    3:3:com.android.tools.r8.androidapi.AndroidApiLevelCompute lambda$new$5():169 -> N
-    1:1:com.android.tools.r8.androidapi.ComputedApiLevel lambda$new$6():172:172 -> O
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():391:391 -> P
-    1:4:void loadApplyMappingSeedMapper():892:895 -> Q
-    5:5:void loadApplyMappingSeedMapper():894:894 -> Q
-    1:1:com.android.tools.r8.utils.InternalOptions options():531:531 -> R
-    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():399:399 -> S
-    1:1:com.android.tools.r8.utils.Reporter reporter():535:535 -> T
-    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet():547:547 -> U
-    1:1:void setAllCodeProcessed():297:297 -> V
-    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory():240:240 -> W
-    1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():671:671 -> X
-    2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():20:20 -> X
-    2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():671 -> X
-    1:4:boolean validateUnboxedEnumsHaveBeenPruned():681:684 -> Y
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():648:648 -> Z
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer lambda$new$3(com.android.tools.r8.utils.Timing):166:166 -> a
-    2:2:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):191:191 -> a
-    3:4:com.android.tools.r8.ir.desugar.TypeRewriter defaultTypeRewriter(com.android.tools.r8.graph.AppInfo):186:187 -> a
-    3:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):191 -> a
-    5:5:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):135:135 -> a
-    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):191 -> a
-    6:6:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):196:196 -> a
-    7:7:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):200:200 -> a
-    8:9:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):205:206 -> a
+    15:15:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():171 -> N
+    16:19:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1688:1691 -> N
+    16:19:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):70 -> N
+    16:19:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():171 -> N
+    20:20:com.android.tools.r8.ir.analysis.proto.ProtoShrinker com.android.tools.r8.ir.analysis.proto.ProtoShrinker.create(com.android.tools.r8.graph.AppView):74:74 -> N
+    20:20:com.android.tools.r8.ir.analysis.proto.ProtoShrinker lambda$new$4():171 -> N
+    1:2:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.create(com.android.tools.r8.graph.AppView):48:49 -> O
+    1:2:com.android.tools.r8.androidapi.AndroidApiLevelCompute lambda$new$5():173 -> O
+    3:3:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.noAndroidApiLevelCompute():54:54 -> O
+    3:3:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.create(com.android.tools.r8.graph.AppView):50 -> O
+    3:3:com.android.tools.r8.androidapi.AndroidApiLevelCompute lambda$new$5():173 -> O
+    1:1:com.android.tools.r8.androidapi.ComputedApiLevel lambda$new$6():176:176 -> P
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():403:403 -> Q
+    1:4:void loadApplyMappingSeedMapper():907:910 -> R
+    5:5:void loadApplyMappingSeedMapper():909:909 -> R
+    1:1:com.android.tools.r8.utils.InternalOptions options():543:543 -> S
+    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():411:411 -> T
+    1:1:com.android.tools.r8.utils.Reporter reporter():547:547 -> U
+    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet():559:559 -> V
+    1:1:void setAllCodeProcessed():301:301 -> W
+    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory simpleInliningConstraintFactory():244:244 -> X
+    1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():683:683 -> Y
+    2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():25:25 -> Y
+    2:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums():683 -> Y
+    1:4:boolean validateUnboxedEnumsHaveBeenPruned():693:696 -> Z
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer lambda$new$3(com.android.tools.r8.utils.Timing):170:170 -> a
+    2:2:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):195:195 -> a
+    3:4:com.android.tools.r8.ir.desugar.TypeRewriter defaultTypeRewriter(com.android.tools.r8.graph.AppInfo):190:191 -> a
+    3:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):195 -> a
+    5:5:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):139:139 -> a
+    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):195 -> a
+    6:6:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter,com.android.tools.r8.utils.Timing):200:200 -> a
+    7:7:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):204:204 -> a
+    8:9:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):209:210 -> a
     10:12:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):51:53 -> a
-    10:12:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):206 -> a
+    10:12:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):210 -> a
     13:13:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.features.ClassToFeatureSplitMap.createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):50:50 -> a
-    13:13:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):206 -> a
-    14:20:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):207:213 -> a
-    21:27:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):209:215 -> a
-    28:29:com.android.tools.r8.ir.desugar.TypeRewriter defaultTypeRewriter(com.android.tools.r8.graph.AppInfo):186:187 -> a
-    28:29:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):215 -> a
-    30:30:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):135:135 -> a
-    30:30:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):215 -> a
-    31:31:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter):219:219 -> a
-    32:32:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):135:135 -> a
-    32:32:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter):219 -> a
-    33:33:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):228:228 -> a
-    34:35:com.android.tools.r8.ir.desugar.TypeRewriter defaultTypeRewriter(com.android.tools.r8.graph.AppInfo):186:187 -> a
-    34:35:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):228 -> a
-    36:36:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):135:135 -> a
-    36:36:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):228 -> a
-    37:37:void setAppServices(com.android.tools.r8.graph.AppServices):311:311 -> a
-    38:38:void setClassesEscapingIntoLibrary(java.util.function.Predicate):324:324 -> a
-    39:39:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):328:328 -> a
-    40:40:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):332:332 -> a
-    41:41:com.android.tools.r8.graph.DexItemFactory dexItemFactory():361:361 -> a
-    42:43:void withArgumentPropagator(com.android.tools.r8.utils.ThrowingConsumer):385:386 -> a
-    44:44:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):417:417 -> a
-    45:45:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1730:1730 -> a
-    45:45:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):417 -> a
+    13:13:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):210 -> a
+    14:20:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):211:217 -> a
+    21:27:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):213:219 -> a
+    28:29:com.android.tools.r8.ir.desugar.TypeRewriter defaultTypeRewriter(com.android.tools.r8.graph.AppInfo):190:191 -> a
+    28:29:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):219 -> a
+    30:30:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):139:139 -> a
+    30:30:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexInfo):219 -> a
+    31:31:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter):223:223 -> a
+    32:32:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):139:139 -> a
+    32:32:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.TypeRewriter):223 -> a
+    33:33:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):232:232 -> a
+    34:35:com.android.tools.r8.ir.desugar.TypeRewriter defaultTypeRewriter(com.android.tools.r8.graph.AppInfo):190:191 -> a
+    34:35:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):232 -> a
+    36:36:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):139:139 -> a
+    36:36:com.android.tools.r8.graph.AppView createForTracer(com.android.tools.r8.graph.AppInfoWithClassHierarchy):232 -> a
+    37:37:void setAppServices(com.android.tools.r8.graph.AppServices):315:315 -> a
+    38:38:void setAssumeInfoCollection(com.android.tools.r8.shaking.AssumeInfoCollection):323:323 -> a
+    39:39:void setClassesEscapingIntoLibrary(java.util.function.Predicate):336:336 -> a
+    40:40:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):340:340 -> a
+    41:41:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):344:344 -> a
+    42:42:com.android.tools.r8.graph.DexItemFactory dexItemFactory():373:373 -> a
+    43:44:void withArgumentPropagator(com.android.tools.r8.utils.ThrowingConsumer):397:398 -> a
+    45:45:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):429:429 -> a
+    46:46:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1706:1706 -> a
+    46:46:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):429 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    46:46:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):418:418 -> a
-    47:48:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):432:433 -> a
-    49:50:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):462:463 -> a
-    51:51:com.android.tools.r8.graph.GraphLens codeLens():469:469 -> a
-    51:51:boolean lambda$rewriteWithLens$8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):838 -> a
+    47:47:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):430:430 -> a
+    48:49:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):444:445 -> a
+    50:51:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):474:475 -> a
+    52:52:com.android.tools.r8.graph.GraphLens codeLens():481:481 -> a
+    52:52:boolean lambda$rewriteWithLens$8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):851 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    52:52:void setCodeLens(com.android.tools.r8.graph.GraphLens):473:473 -> a
-    53:53:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):510:510 -> a
-    54:54:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):515:515 -> a
-    55:55:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():539:539 -> a
-    55:55:boolean checkForTesting(java.util.function.Supplier):908 -> a
-    56:56:boolean checkForTesting(java.util.function.Supplier):908:908 -> a
-    57:57:void setRootSet(com.android.tools.r8.shaking.RootSetUtils$RootSet):551:551 -> a
-    58:59:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):555:556 -> a
-    60:60:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():568:568 -> a
-    60:60:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):572 -> a
-    61:61:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):572:572 -> a
-    62:62:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():568:568 -> a
-    62:62:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):576 -> a
-    63:63:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):576:576 -> a
-    64:64:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> a
-    64:64:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):576 -> a
-    65:65:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():568:568 -> a
-    65:65:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):580 -> a
-    66:66:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):580:580 -> a
-    67:67:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
-    67:67:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):580 -> a
-    68:68:void setNamingLens(com.android.tools.r8.naming.NamingLens):588:588 -> a
-    69:70:void setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):601:602 -> a
-    71:71:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):630:630 -> a
-    72:72:boolean hasHorizontallyMergedClasses():617:617 -> a
-    72:72:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):630 -> a
-    73:73:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):630:630 -> a
-    74:74:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():625:625 -> a
-    74:74:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):631 -> a
-    75:76:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):631:632 -> a
-    77:77:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():539:539 -> a
-    77:77:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):633 -> a
-    78:80:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):633:635 -> a
-    81:81:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():625:625 -> a
-    81:81:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):635 -> a
-    82:82:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):635:635 -> a
-    83:84:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):652:653 -> a
-    85:85:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():539:539 -> a
-    85:85:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):654 -> a
-    86:86:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):654:654 -> a
-    87:87:void setOpenClosedInterfacesCollection(com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection):663:663 -> a
-    88:89:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):675:676 -> a
-    90:90:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():539:539 -> a
-    90:90:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):677 -> a
-    91:91:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):677:677 -> a
-    92:92:boolean hasClassHierarchy():691:691 -> a
-    92:92:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):721 -> a
-    93:98:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):722:727 -> a
-    99:99:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):725:725 -> a
-    100:100:boolean hasLiveness():708:708 -> a
-    100:100:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):854 -> a
+    53:53:void setCodeLens(com.android.tools.r8.graph.GraphLens):485:485 -> a
+    54:54:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):522:522 -> a
+    55:55:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):527:527 -> a
+    56:56:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():551:551 -> a
+    56:56:boolean checkForTesting(java.util.function.Supplier):923 -> a
+    57:57:boolean checkForTesting(java.util.function.Supplier):923:923 -> a
+    58:58:void setRootSet(com.android.tools.r8.shaking.RootSetUtils$RootSet):563:563 -> a
+    59:60:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):567:568 -> a
+    61:61:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():580:580 -> a
+    61:61:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):584 -> a
+    62:62:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):584:584 -> a
+    63:63:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():580:580 -> a
+    63:63:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):588 -> a
+    64:64:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):588:588 -> a
+    65:65:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> a
+    65:65:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):588 -> a
+    66:66:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():580:580 -> a
+    66:66:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):592 -> a
+    67:67:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):592:592 -> a
+    68:68:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
+    68:68:com.android.tools.r8.shaking.KeepMethodInfo getKeepInfo(com.android.tools.r8.graph.ProgramMethod):592 -> a
+    69:69:void setNamingLens(com.android.tools.r8.naming.NamingLens):600:600 -> a
+    70:71:void setProguardCompatibilityActions(com.android.tools.r8.shaking.ProguardCompatibilityActions):613:614 -> a
+    72:72:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):642:642 -> a
+    73:73:boolean hasHorizontallyMergedClasses():629:629 -> a
+    73:73:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):642 -> a
+    74:74:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):642:642 -> a
+    75:75:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():637:637 -> a
+    75:75:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):643 -> a
+    76:77:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):643:644 -> a
+    78:78:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():551:551 -> a
+    78:78:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):645 -> a
+    79:81:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):645:647 -> a
+    82:82:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():637:637 -> a
+    82:82:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):647 -> a
+    83:83:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):647:647 -> a
+    84:85:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):664:665 -> a
+    86:86:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():551:551 -> a
+    86:86:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):666 -> a
+    87:87:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):666:666 -> a
+    88:88:void setOpenClosedInterfacesCollection(com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection):675:675 -> a
+    89:90:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):687:688 -> a
+    91:91:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():551:551 -> a
+    91:91:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):689 -> a
+    92:92:void setUnboxedEnums(com.android.tools.r8.ir.optimize.enums.EnumDataMap):689:689 -> a
+    93:93:boolean hasClassHierarchy():703:703 -> a
+    93:93:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):733 -> a
+    94:99:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):734:739 -> a
+    100:100:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):737:737 -> a
+    101:101:boolean hasLiveness():720:720 -> a
+    101:101:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):867 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    101:101:boolean hasLiveness():708:708 -> a
-    101:101:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):854 -> a
-    102:103:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):856:857 -> a
-    104:104:com.android.tools.r8.graph.AppServices appServices():307:307 -> a
-    104:104:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):859 -> a
-    105:105:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):859:859 -> a
-    106:106:boolean hasInitClassLens():506:506 -> a
-    106:106:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):860 -> a
-    107:107:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):861:861 -> a
-    108:108:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):510:510 -> a
-    108:108:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):861 -> a
-    109:109:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):863:863 -> a
-    110:110:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():596:596 -> a
-    110:110:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):865 -> a
-    111:111:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):865:865 -> a
-    112:115:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):864:867 -> a
-    116:116:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():564:564 -> a
-    116:116:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):868 -> a
-    117:117:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):868:868 -> a
-    118:118:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):556:556 -> a
-    118:118:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):868 -> a
-    119:119:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection getOpenClosedInterfacesCollection():658:658 -> a
-    119:119:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):871 -> a
-    120:120:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):871:871 -> a
-    121:121:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):870:870 -> a
-    122:122:boolean hasRootSet():543:543 -> a
-    122:122:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):872 -> a
-    123:123:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):873:873 -> a
-    124:124:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):731:731 -> a
-    125:125:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    125:125:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):731 -> a
+    102:102:boolean hasLiveness():720:720 -> a
+    102:102:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):867 -> a
+    103:104:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):869:870 -> a
+    105:105:com.android.tools.r8.graph.AppServices appServices():311:311 -> a
+    105:105:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):872 -> a
+    106:106:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):872:872 -> a
+    107:107:com.android.tools.r8.shaking.AssumeInfoCollection getAssumeInfoCollection():319:319 -> a
+    107:107:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):874 -> a
+    108:108:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):874:874 -> a
+    109:109:void setAssumeInfoCollection(com.android.tools.r8.shaking.AssumeInfoCollection):323:323 -> a
+    109:109:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):873 -> a
+    110:110:boolean hasInitClassLens():518:518 -> a
+    110:110:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):875 -> a
+    111:111:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):876:876 -> a
+    112:112:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):522:522 -> a
+    112:112:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):876 -> a
+    113:113:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):878:878 -> a
+    114:114:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():608:608 -> a
+    114:114:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):880 -> a
+    115:115:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):880:880 -> a
+    116:119:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):879:882 -> a
+    120:120:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():576:576 -> a
+    120:120:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):883 -> a
+    121:121:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):883:883 -> a
+    122:122:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):568:568 -> a
+    122:122:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):883 -> a
+    123:123:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection getOpenClosedInterfacesCollection():670:670 -> a
+    123:123:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):886 -> a
+    124:124:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):886:886 -> a
+    125:125:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):885:885 -> a
+    126:126:boolean hasRootSet():555:555 -> a
+    126:126:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):887 -> a
+    127:127:void lambda$rewriteWithLens$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):888:888 -> a
+    128:128:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):743:743 -> a
+    129:129:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    129:129:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):743 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    126:126:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    126:126:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):731 -> a
-    127:131:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):734:738 -> a
-    132:141:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):747:756 -> a
-    142:142:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):782:782 -> a
-    142:142:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):758 -> a
-    143:143:com.android.tools.r8.graph.AppServices appServices():307:307 -> a
-    143:143:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):760 -> a
-    144:146:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):761:763 -> a
-    147:147:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():596:596 -> a
-    147:147:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):765 -> a
-    148:148:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):765:765 -> a
-    149:149:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):764:764 -> a
-    150:150:boolean hasRootSet():543:543 -> a
-    150:150:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):767 -> a
-    151:154:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):768:771 -> a
-    155:155:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):556:556 -> a
-    155:155:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):771 -> a
-    156:158:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):773:773 -> a
-    159:159:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):793:793 -> a
-    160:162:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):798:800 -> a
-    160:162:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):793 -> a
-    163:173: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):812:822 -> a
-    174:174:com.android.tools.r8.graph.GraphLens codeLens():469:469 -> a
-    174:174: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):823 -> a
-    175:183: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):823:831 -> a
-    184:184:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
-    184:184: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):832 -> a
-    185:185:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
-    185:185: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):833 -> a
-    186:187: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):834:835 -> a
-    188:188:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
-    188:188: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):841 -> a
-    189:197: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):843:851 -> a
-    198:198:boolean lambda$rewriteWithLens$7(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):837:837 -> a
-    199:199:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
-    199:199:boolean lambda$rewriteWithLens$7(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):837 -> a
-    200:200:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
-    200:200:boolean lambda$rewriteWithLens$7(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):837 -> a
-    201:202:void setAlreadyLibraryDesugared(java.util.Set):879:880 -> a
-    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():696:696 -> a0
-    1:1:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):223:223 -> b
-    2:3:com.android.tools.r8.ir.desugar.TypeRewriter defaultTypeRewriter(com.android.tools.r8.graph.AppInfo):186:187 -> b
-    2:3:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):223 -> b
-    4:4:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):135:135 -> b
-    4:4:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):223 -> b
-    5:5:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():232:232 -> b
-    6:7:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):425:426 -> b
-    8:9:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):454:455 -> b
-    10:17:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):482:489 -> b
+    130:130:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    130:130:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):743 -> a
+    131:135:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):746:750 -> a
+    136:145:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):759:768 -> a
+    146:146:void pruneAppInfo(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):795:795 -> a
+    146:146:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):770 -> a
+    147:147:com.android.tools.r8.graph.AppServices appServices():311:311 -> a
+    147:147:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):772 -> a
+    148:148:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):773:773 -> a
+    149:149:com.android.tools.r8.shaking.AssumeInfoCollection getAssumeInfoCollection():319:319 -> a
+    149:149:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):775 -> a
+    150:150:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):775:775 -> a
+    151:151:void setAssumeInfoCollection(com.android.tools.r8.shaking.AssumeInfoCollection):323:323 -> a
+    151:151:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):775 -> a
+    152:152:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):776:776 -> a
+    153:153:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():608:608 -> a
+    153:153:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):778 -> a
+    154:154:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):778:778 -> a
+    155:155:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):777:777 -> a
+    156:156:boolean hasRootSet():555:555 -> a
+    156:156:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):780 -> a
+    157:160:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):781:784 -> a
+    161:161:void setMainDexRootSet(com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet):568:568 -> a
+    161:161:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):784 -> a
+    162:164:void pruneItems(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):786:786 -> a
+    165:165:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):806:806 -> a
+    166:168:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):811:813 -> a
+    166:168:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):806 -> a
+    169:179: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):825:835 -> a
+    180:180:com.android.tools.r8.graph.GraphLens codeLens():481:481 -> a
+    180:180: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):836 -> a
+    181:189: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):836:844 -> a
+    190:190:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
+    190:190: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):845 -> a
+    191:191:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
+    191:191: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):846 -> a
+    192:193: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):847:848 -> a
+    194:194:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
+    194:194: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):854 -> a
+    195:203: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):856:864 -> a
+    204:204:boolean lambda$rewriteWithLens$7(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):850:850 -> a
+    205:205:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingLens():0:0 -> a
+    205:205:boolean lambda$rewriteWithLens$7(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):850 -> a
+    206:206:boolean com.android.tools.r8.graph.GraphLens.isMemberRebindingIdentityLens():0:0 -> a
+    206:206:boolean lambda$rewriteWithLens$7(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):850 -> a
+    207:208:void setAlreadyLibraryDesugared(java.util.Set):894:895 -> a
+    209:210:void addPrunedClassSourceFile(com.android.tools.r8.graph.DexType,java.lang.String):935:936 -> a
+    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():660:660 -> a0
+    1:1:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):227:227 -> b
+    2:3:com.android.tools.r8.ir.desugar.TypeRewriter defaultTypeRewriter(com.android.tools.r8.graph.AppInfo):190:191 -> b
+    2:3:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):227 -> b
+    4:4:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.TypeRewriter):139:139 -> b
+    4:4:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):227 -> b
+    5:5:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():236:236 -> b
+    6:7:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):437:438 -> b
+    8:9:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):466:467 -> b
+    10:17:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):494:501 -> b
     18:18:boolean com.android.tools.r8.graph.GraphLens.isAppliedLens():0:0 -> b
-    18:18:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):489 -> b
+    18:18:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):501 -> b
     19:19:boolean com.android.tools.r8.graph.GraphLens.isClearCodeRewritingLens():0:0 -> b
-    19:19:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):489 -> b
-    20:20:void setCodeLens(com.android.tools.r8.graph.GraphLens):473:473 -> b
-    20:20:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):490 -> b
-    21:21:void setCfByteCodePassThrough(java.util.Set):519:519 -> b
-    22:23:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):524:525 -> b
-    24:24:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):787:787 -> b
-    25:29:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):884:888 -> b
-    com.android.tools.r8.graph.AppView withLiveness() -> b0
-    1:1:com.android.tools.r8.contexts.CompilationContext lambda$new$0(com.android.tools.r8.graph.AppInfo):147:147 -> c
-    2:2:boolean isModeled(com.android.tools.r8.graph.DexType):182:182 -> c
-    3:4:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):410:411 -> c
-    5:6:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):447:448 -> c
-    7:7:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():606:606 -> c
-    8:8:boolean hasHorizontallyMergedClasses():617:617 -> c
-    8:8:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():607 -> c
-    9:12:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():608:611 -> c
-    1:1:com.android.tools.r8.graph.AppView withoutClassHierarchy():703:703 -> c0
-    2:2:boolean hasClassHierarchy():691:691 -> c0
-    2:2:com.android.tools.r8.graph.AppView withoutClassHierarchy():703 -> c0
-    3:3:com.android.tools.r8.graph.AppView withoutClassHierarchy():703:703 -> c0
-    1:3:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):277:279 -> d
-    4:4:void unsetAppInfoForDesugaring():273:273 -> d
-    4:4:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):280 -> d
-    5:8:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):282:285 -> d
-    9:9:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):337:337 -> d
-    10:11:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):440:441 -> d
-    12:12:com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute():912:912 -> d
-    1:1:com.android.tools.r8.graph.DexApplication app():244:244 -> e
-    2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):342:342 -> e
-    3:4:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):404:405 -> e
-    1:2:com.android.tools.r8.graph.AppInfo appInfo():248:249 -> f
-    3:4:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):319:320 -> f
-    1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():261:269 -> g
-    1:1:boolean hasClassHierarchy():691:691 -> h
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoWithClassHierarchy():253 -> h
-    2:2:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoWithClassHierarchy():253:253 -> h
-    1:1:boolean hasLiveness():708:708 -> i
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness appInfoWithLiveness():257 -> i
-    2:2:com.android.tools.r8.shaking.AppInfoWithLiveness appInfoWithLiveness():257:257 -> i
-    1:1:com.android.tools.r8.graph.AppServices appServices():307:307 -> j
-    1:1:boolean canUseInitClass():498:498 -> k
+    19:19:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):501 -> b
+    20:20:void setCodeLens(com.android.tools.r8.graph.GraphLens):485:485 -> b
+    20:20:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):502 -> b
+    21:21:void setCfByteCodePassThrough(java.util.Set):531:531 -> b
+    22:23:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):536:537 -> b
+    24:24:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):800:800 -> b
+    25:29:boolean isAlreadyLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):899:903 -> b
+    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():708:708 -> b0
+    1:1:com.android.tools.r8.contexts.CompilationContext lambda$new$0(com.android.tools.r8.graph.AppInfo):151:151 -> c
+    2:2:boolean isModeled(com.android.tools.r8.graph.DexType):186:186 -> c
+    3:4:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):422:423 -> c
+    5:6:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):459:460 -> c
+    7:7:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():618:618 -> c
+    8:8:boolean hasHorizontallyMergedClasses():629:629 -> c
+    8:8:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():619 -> c
+    9:12:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():620:623 -> c
+    com.android.tools.r8.graph.AppView withLiveness() -> c0
+    1:3:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):281:283 -> d
+    4:4:void unsetAppInfoForDesugaring():277:277 -> d
+    4:4:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):284 -> d
+    5:8:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):286:289 -> d
+    9:9:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):349:349 -> d
+    10:11:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):452:453 -> d
+    12:12:com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute():927:927 -> d
+    1:1:com.android.tools.r8.graph.AppView withoutClassHierarchy():715:715 -> d0
+    2:2:boolean hasClassHierarchy():703:703 -> d0
+    2:2:com.android.tools.r8.graph.AppView withoutClassHierarchy():715 -> d0
+    3:3:com.android.tools.r8.graph.AppView withoutClassHierarchy():715:715 -> d0
+    1:1:com.android.tools.r8.graph.DexApplication app():248:248 -> e
+    2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):354:354 -> e
+    3:4:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):416:417 -> e
+    1:2:com.android.tools.r8.graph.AppInfo appInfo():252:253 -> f
+    3:3:java.lang.String getPrunedClassSourceFileInfo(com.android.tools.r8.graph.DexType):941:941 -> f
+    1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():265:273 -> g
+    10:11:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):331:332 -> g
+    1:1:boolean hasClassHierarchy():703:703 -> h
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoWithClassHierarchy():257 -> h
+    2:2:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoWithClassHierarchy():257:257 -> h
+    1:1:boolean hasLiveness():720:720 -> i
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness appInfoWithLiveness():261 -> i
+    2:2:com.android.tools.r8.shaking.AppInfoWithLiveness appInfoWithLiveness():261:261 -> i
+    1:1:com.android.tools.r8.graph.AppServices appServices():311:311 -> j
+    1:1:boolean canUseInitClass():510:510 -> k
     2:2:boolean com.android.tools.r8.graph.InitClassLens.isFinal():0:0 -> k
-    2:2:boolean canUseInitClass():498 -> k
-    1:1:void clearApplyMappingSeedMapper():904:904 -> l
-    1:1:com.android.tools.r8.graph.GraphLens clearCodeRewritings():301:301 -> m
+    2:2:boolean canUseInitClass():510 -> k
+    1:1:void clearApplyMappingSeedMapper():919:919 -> l
+    1:1:com.android.tools.r8.graph.GraphLens clearCodeRewritings():305:305 -> m
     2:2:com.android.tools.r8.graph.GraphLens com.android.tools.r8.graph.GraphLens.withCodeRewritingsApplied(com.android.tools.r8.graph.DexItemFactory):604:604 -> m
-    2:2:com.android.tools.r8.graph.GraphLens clearCodeRewritings():301 -> m
+    2:2:com.android.tools.r8.graph.GraphLens clearCodeRewritings():305 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.graph.GraphLens com.android.tools.r8.graph.GraphLens.withCodeRewritingsApplied(com.android.tools.r8.graph.DexItemFactory):605:605 -> m
-    3:3:com.android.tools.r8.graph.GraphLens clearCodeRewritings():301 -> m
-    4:4:com.android.tools.r8.graph.GraphLens clearCodeRewritings():302:302 -> m
-    1:1:com.android.tools.r8.graph.GraphLens codeLens():469:469 -> n
-    1:1:com.android.tools.r8.androidapi.ComputedApiLevel computedMinApiLevel():916:916 -> o
-    1:1:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():375:375 -> p
-    2:2:boolean verifyMainThread():176:176 -> p
-    2:2:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():375 -> p
-    3:3:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():376:376 -> p
-    1:1:boolean enableWholeProgramOptimizations():365:365 -> q
-    1:1:com.android.tools.r8.naming.SeedMapper getApplyMappingSeedMapper():900:900 -> r
-    1:1:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration getDontWarnConfiguration():315:315 -> s
-    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():568:568 -> t
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection getLibraryMethodSideEffectModelCollection():395:395 -> u
-    1:1:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():564:564 -> v
-    1:1:com.android.tools.r8.naming.NamingLens getNamingLens():584:584 -> w
-    1:1:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection getOpenClosedInterfacesCollection():658:658 -> x
-    1:1:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():596:596 -> y
-    1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():380:380 -> z
+    3:3:com.android.tools.r8.graph.GraphLens clearCodeRewritings():305 -> m
+    4:4:com.android.tools.r8.graph.GraphLens clearCodeRewritings():306:306 -> m
+    1:1:com.android.tools.r8.graph.GraphLens codeLens():481:481 -> n
+    1:1:com.android.tools.r8.androidapi.ComputedApiLevel computedMinApiLevel():931:931 -> o
+    1:1:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():387:387 -> p
+    2:2:boolean verifyMainThread():180:180 -> p
+    2:2:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():387 -> p
+    3:3:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():388:388 -> p
+    1:1:boolean enableWholeProgramOptimizations():377:377 -> q
+    1:1:com.android.tools.r8.naming.SeedMapper getApplyMappingSeedMapper():915:915 -> r
+    1:1:com.android.tools.r8.shaking.AssumeInfoCollection getAssumeInfoCollection():319:319 -> s
+    1:1:com.android.tools.r8.errors.dontwarn.DontWarnConfiguration getDontWarnConfiguration():327:327 -> t
+    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():580:580 -> u
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection getLibraryMethodSideEffectModelCollection():407:407 -> v
+    1:1:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet getMainDexRootSet():576:576 -> w
+    1:1:com.android.tools.r8.naming.NamingLens getNamingLens():596:596 -> x
+    1:1:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection getOpenClosedInterfacesCollection():670:670 -> y
+    1:1:com.android.tools.r8.shaking.ProguardCompatibilityActions getProguardCompatibilityActions():608:608 -> z
 com.android.tools.r8.graph.ApplicationReaderMap -> com.android.tools.r8.internal.C2:
     1:1:void <init>():9:9 -> <init>
     java.lang.String getDescriptor(java.lang.String) -> a
@@ -25896,11 +26012,11 @@
     622:627:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):112:117 -> c
     670:670:void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):149:149 -> c
     671:672:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):180:181 -> c
-    673:673: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):309:309 -> c
+    673:673: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):316:316 -> c
     673:673:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):181 -> c
     674:683:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):182:191 -> c
     1:4:void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):122:125 -> d
-com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.internal.b6:
+com.android.tools.r8.graph.BottomUpClassHierarchyTraversal -> com.android.tools.r8.internal.d6:
     java.util.function.Function immediateSubtypesProvider -> g
     1:2:void <init>(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):18:19 -> <init>
     1:2:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):28:29 -> a
@@ -26021,12 +26137,12 @@
     566:568: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):519:521 -> a
     569:569: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.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):570:570 -> a
     569:569: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):520 -> a
-    570:570:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    570:570:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     570:570:boolean com.android.tools.r8.graph.ProgramMethod.keepLocals(com.android.tools.r8.graph.AppView):202 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     570:570: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.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):570 -> a
     570:570: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):520 -> a
-    571:571:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    571:571:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     571:571:boolean com.android.tools.r8.graph.ProgramMethod.keepLocals(com.android.tools.r8.graph.AppView):202 -> a
     571:571: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.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):570 -> a
     571:571: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):520 -> a
@@ -26053,12 +26169,12 @@
     597:610: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.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):534:547 -> a
     611:611: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.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):570:570 -> a
     611:611: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.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):538 -> a
-    612:612:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    612:612:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     612:612:boolean com.android.tools.r8.graph.ProgramMethod.keepLocals(com.android.tools.r8.graph.AppView):202 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     612:612: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.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):570 -> a
     612:612: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.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):538 -> a
-    613:613:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    613:613:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     613:613:boolean com.android.tools.r8.graph.ProgramMethod.keepLocals(com.android.tools.r8.graph.AppView):202 -> a
     613:613: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.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):570 -> a
     613:613: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.graph.GraphLens,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):538 -> a
@@ -26197,7 +26313,7 @@
     917:918:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):304:305 -> a
     917:918:com.android.tools.r8.utils.TraversalContinuation computeInitialState(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,boolean):1056 -> a
     917:918:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):962 -> a
-    919:919:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    919:919:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     919:919:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):305 -> a
     919:919:com.android.tools.r8.utils.TraversalContinuation computeInitialState(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,boolean):1056 -> a
     919:919:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):962 -> a
@@ -26215,7 +26331,7 @@
     926:926:boolean com.android.tools.r8.graph.DexMethod.isHorizontallyMergedInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):317:317 -> a
     926:926:com.android.tools.r8.utils.TraversalContinuation computeInitialState(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,boolean):1057 -> a
     926:926:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):962 -> a
-    927:927:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    927:927:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     927:927:boolean com.android.tools.r8.graph.DexMethod.isHorizontallyMergedInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):317 -> a
     927:927:com.android.tools.r8.utils.TraversalContinuation computeInitialState(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,boolean):1057 -> a
     927:927:com.android.tools.r8.graph.CfCode$StackMapStatus verifyFrames(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):962 -> a
@@ -26318,7 +26434,7 @@
     140:140:java.lang.String toString():137:137 -> toString
     141:141:java.lang.String toString():137:137 -> toString
     138:138:java.lang.String toString():137:137 -> toString
-com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.n7:
+com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.q7:
     com.android.tools.r8.position.MethodPosition methodPosition -> c
     com.android.tools.r8.origin.Origin origin -> b
     java.lang.String diagnosticMessage -> d
@@ -26326,7 +26442,7 @@
     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.p7:
+com.android.tools.r8.graph.CfCodeStackMapValidatingException -> com.android.tools.r8.internal.s7:
     1:12:com.android.tools.r8.graph.CfCodeDiagnostics invalidTryCatchRange(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfTryCatch,java.lang.String,com.android.tools.r8.graph.AppView):51:62 -> a
     13:13:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
     13:13:com.android.tools.r8.graph.CfCodeDiagnostics invalidTryCatchRange(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfTryCatch,java.lang.String,com.android.tools.r8.graph.AppView):62 -> a
@@ -26400,7 +26516,7 @@
     3:3:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):137:137 -> a
     4:4:void acceptHashing(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.utils.structural.HashingVisitor):146:146 -> a
     4:4:void acceptHashing(java.lang.Object,com.android.tools.r8.utils.structural.HashingVisitor):137 -> a
-com.android.tools.r8.graph.CfWritableCode -> com.android.tools.r8.internal.o9:
+com.android.tools.r8.graph.CfWritableCode -> com.android.tools.r8.internal.r9:
     com.android.tools.r8.graph.CfWritableCode$CfWritableCodeKind getCfWritableCodeKind() -> N
     com.android.tools.r8.graph.CfCode asCfCode() -> V
     void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor) -> a
@@ -26450,14 +26566,14 @@
     2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):73 -> i
     1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):67:69 -> j
     com.android.tools.r8.graph.AccessFlags self() -> z
-com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.da:
+com.android.tools.r8.graph.ClassDefinition -> com.android.tools.r8.internal.ga:
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> G
     void forEachClassField(java.util.function.Consumer) -> b
     com.android.tools.r8.graph.MethodCollection getMethodCollection() -> b0
     void forEachClassMethod(java.util.function.Consumer) -> c
     boolean isLibraryClass() -> f0
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> l
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.fa:
+com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.ia:
     java.util.Deque worklist -> d
     java.util.Set visited -> c
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope scope -> b
@@ -26476,16 +26592,16 @@
     java.util.function.Predicate check -> b
     com.android.tools.r8.graph.ClassKind$Factory factory -> a
     com.android.tools.r8.graph.ClassKind PROGRAM -> c
-    1:85:void <clinit>():18:102 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.ClassKind$Factory,java.util.function.Predicate):171:173 -> <init>
-    1:1: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,com.android.tools.r8.synthesis.SyntheticMarker):197:197 -> a
-    2:2:boolean isOfKind(com.android.tools.r8.graph.DexClass):221:221 -> a
-    1:17:com.android.tools.r8.graph.DexProgramClass lambda$static$0(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,com.android.tools.r8.synthesis.SyntheticMarker):40:56 -> b
-    1:17:com.android.tools.r8.graph.DexClasspathClass 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,com.android.tools.r8.synthesis.SyntheticMarker):83:99 -> c
-    1:17:com.android.tools.r8.graph.DexLibraryClass lambda$static$2(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,com.android.tools.r8.synthesis.SyntheticMarker):124:140 -> d
+    1:89:void <clinit>():18:106 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.ClassKind$Factory,java.util.function.Predicate):178:180 -> <init>
+    1:1: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,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,com.android.tools.r8.synthesis.SyntheticMarker):205:205 -> a
+    2:2:boolean isOfKind(com.android.tools.r8.graph.DexClass):230:230 -> a
+    1:18:com.android.tools.r8.graph.DexProgramClass lambda$static$0(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,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,com.android.tools.r8.synthesis.SyntheticMarker):41:58 -> b
+    1:18:com.android.tools.r8.graph.DexClasspathClass 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,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,com.android.tools.r8.synthesis.SyntheticMarker):86:103 -> c
+    1:18:com.android.tools.r8.graph.DexLibraryClass lambda$static$2(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,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,com.android.tools.r8.synthesis.SyntheticMarker):129:146 -> d
 com.android.tools.r8.graph.ClassKind$Factory -> com.android.tools.r8.graph.q:
-    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,com.android.tools.r8.synthesis.SyntheticMarker) -> a
-com.android.tools.r8.graph.ClassResolutionResult -> com.android.tools.r8.internal.lb:
+    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,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,com.android.tools.r8.synthesis.SyntheticMarker) -> a
+com.android.tools.r8.graph.ClassResolutionResult -> com.android.tools.r8.internal.ob:
     com.android.tools.r8.graph.DexClass toSingleClassWithProgramOverLibrary() -> D
     boolean hasClassResolutionResult() -> X
     void forEachClassResolutionResult(java.util.function.Consumer) -> a
@@ -26505,11 +26621,11 @@
     20:20:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
     20:20:com.android.tools.r8.graph.ClassResolutionResult build():72 -> a
     21:23:com.android.tools.r8.graph.ClassResolutionResult build():72:74 -> a
-com.android.tools.r8.graph.ClassResolutionResult$ClasspathAndLibraryClassResolutionResult -> com.android.tools.r8.internal.ib:
+com.android.tools.r8.graph.ClassResolutionResult$ClasspathAndLibraryClassResolutionResult -> com.android.tools.r8.internal.lb:
     1:1:void <init>(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.graph.DexLibraryClass):160:160 -> <init>
     1:1:com.android.tools.r8.graph.DexClass toSingleClassWithProgramOverLibrary():165:165 -> D
     1:1:com.android.tools.r8.graph.DexClass toAlternativeClassWithProgramOverLibrary():170:170 -> g0
-com.android.tools.r8.graph.ClassResolutionResult$MultipleClassResolutionResult -> com.android.tools.r8.internal.jb:
+com.android.tools.r8.graph.ClassResolutionResult$MultipleClassResolutionResult -> com.android.tools.r8.internal.mb:
     com.android.tools.r8.graph.DexClass programOrClasspathClass -> b
     com.android.tools.r8.graph.DexLibraryClass libraryClass -> c
     1:3:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexLibraryClass):114:116 -> <init>
@@ -26525,11 +26641,11 @@
     void forEachClassResolutionResult(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.graph.ClassResolutionResult noResult():84:84 -> a
     com.android.tools.r8.graph.DexClass toAlternativeClassWithProgramOverLibrary() -> g0
-com.android.tools.r8.graph.ClassResolutionResult$ProgramAndLibraryClassResolutionResult -> com.android.tools.r8.internal.kb:
+com.android.tools.r8.graph.ClassResolutionResult$ProgramAndLibraryClassResolutionResult -> com.android.tools.r8.internal.nb:
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexLibraryClass):141:141 -> <init>
     1:1:com.android.tools.r8.graph.DexClass toSingleClassWithProgramOverLibrary():146:146 -> D
     1:1:com.android.tools.r8.graph.DexClass toAlternativeClassWithProgramOverLibrary():151:151 -> g0
-com.android.tools.r8.graph.ClasspathDefinition -> com.android.tools.r8.internal.Fb:
+com.android.tools.r8.graph.ClasspathDefinition -> com.android.tools.r8.internal.Ib:
     1:1:com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext):22:22 -> a
 com.android.tools.r8.graph.ClasspathField -> com.android.tools.r8.graph.u:
     boolean $assertionsDisabled -> f
@@ -26552,15 +26668,15 @@
     3:3:com.android.tools.r8.graph.DexClasspathClass getHolder():44 -> N
     4:5:com.android.tools.r8.graph.DexClasspathClass getHolder():44:45 -> N
     1:1:com.android.tools.r8.graph.DexClass getHolder():9:9 -> a
-com.android.tools.r8.graph.ClasspathOrLibraryClass -> com.android.tools.r8.internal.Gb:
-com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.Hb:
+com.android.tools.r8.graph.ClasspathOrLibraryClass -> com.android.tools.r8.internal.Jb:
+com.android.tools.r8.graph.ClasspathOrLibraryContext -> com.android.tools.r8.internal.Kb:
     com.android.tools.r8.graph.Definition context -> b
     com.android.tools.r8.graph.ProgramDerivedContext programDerivedContext -> c
     1:3:void <init>(com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.ProgramDerivedContext):17:19 -> <init>
     1:1:com.android.tools.r8.graph.ClasspathOrLibraryContext create(com.android.tools.r8.graph.ClasspathDefinition,com.android.tools.r8.graph.ProgramDerivedContext):24:24 -> a
     2:2:com.android.tools.r8.graph.ClasspathOrLibraryContext create(com.android.tools.r8.graph.LibraryDefinition,com.android.tools.r8.graph.ProgramDerivedContext):29:29 -> a
     1:1:com.android.tools.r8.graph.Definition getContext():34:34 -> getContext
-com.android.tools.r8.graph.ClasspathOrLibraryDefinition -> com.android.tools.r8.internal.Ib:
+com.android.tools.r8.graph.ClasspathOrLibraryDefinition -> com.android.tools.r8.internal.Lb:
     com.android.tools.r8.graph.ClasspathOrLibraryDefinition asClasspathOrLibraryDefinition() -> j
 com.android.tools.r8.graph.Code -> com.android.tools.r8.graph.w:
     1:1:void <init>():20:20 -> <init>
@@ -26597,7 +26713,7 @@
     boolean isIncompleteHorizontalClassMergerCode() -> w0
     boolean isSharedCodeObject() -> x0
     boolean verifyNoInputReaders() -> y0
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.cf:
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.gf:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexString signature -> d
     com.android.tools.r8.graph.DexType type -> c
@@ -26672,7 +26788,7 @@
     40:40:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     40:40:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     40:40:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):182 -> a
-    41:41:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    41:41:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     41:41:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193 -> a
     41:41:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     41:41:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):182 -> a
@@ -26751,7 +26867,7 @@
     13:14:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):417:418 -> d
     15:15:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):412:412 -> d
     1:1:java.util.List getInstructionBuilders():410:410 -> f
-com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.Ef:
+com.android.tools.r8.graph.Definition -> com.android.tools.r8.internal.If:
     com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> A
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> H
     boolean isMethod() -> I
@@ -26788,55 +26904,63 @@
     1:1:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):60:60 -> a
     2:2:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):110:110 -> a
     3:9:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):114:120 -> a
-    10:10:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    10:10:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     10:10:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):120 -> a
     11:14:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):123:126 -> a
-    15:15:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):268:268 -> a
+    15:15:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):273:273 -> a
     15:15:boolean retainCompileTimeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.InternalOptions):126 -> a
     16:16:com.android.tools.r8.graph.DexAnnotation createEnclosingClassAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):134:134 -> a
     17:21:com.android.tools.r8.graph.DexType getEnclosingClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):140:144 -> a
     22:22:com.android.tools.r8.graph.DexAnnotation createEnclosingMethodAnnotation(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):149:149 -> a
-    23:27:com.android.tools.r8.graph.DexAnnotation createMemberClassesAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):224:228 -> a
-    28:36: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):280:288 -> a
-    37:41:com.android.tools.r8.graph.DexAnnotation createAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):295:295 -> a
-    42:42:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):303:303 -> a
-    43:70:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):402:429 -> a
-    43:70:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):304 -> a
-    71:71:com.android.tools.r8.graph.DexValue toDexValue(java.lang.String,com.android.tools.r8.graph.DexItemFactory):437:437 -> a
-    71:71:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):429 -> a
-    71:71:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):304 -> a
-    72:76:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):429:433 -> a
-    72:76:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):304 -> a
-    77:77:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):303:303 -> a
-    78:80:com.android.tools.r8.graph.DexAnnotation createNestHostAnnotation(com.android.tools.r8.graph.NestHostClassAttribute,com.android.tools.r8.graph.DexItemFactory):309:309 -> a
-    81:88:com.android.tools.r8.graph.DexAnnotation createNestMembersAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):315:322 -> a
-    89:89:com.android.tools.r8.graph.DexAnnotation createNestMembersAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):319:319 -> a
-    90:95:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):326:331 -> a
-    96:96:com.android.tools.r8.graph.DexAnnotation createThrowsAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):341:341 -> a
-    97:99: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):347:349 -> a
-    100:104:com.android.tools.r8.graph.DexValue getSystemValueAnnotationValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):354:358 -> a
-    105:137:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSynthesizedClassAnnotationInfo(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticItems):461:493 -> a
-    138:145:com.android.tools.r8.graph.DexAnnotation rewrite(java.util.function.Function):498:505 -> a
+    23:27:com.android.tools.r8.graph.DexAnnotation createMemberClassesAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):229:233 -> a
+    28:36: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):295:303 -> a
+    37:41:com.android.tools.r8.graph.DexAnnotation createAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexItemFactory):310:310 -> a
+    42:42:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):318:318 -> a
+    43:70:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):429:456 -> a
+    43:70:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):319 -> a
+    71:71:com.android.tools.r8.graph.DexValue toDexValue(java.lang.String,com.android.tools.r8.graph.DexItemFactory):464:464 -> a
+    71:71:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):456 -> a
+    71:71:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):319 -> a
+    72:76:com.android.tools.r8.graph.DexValue compressSignature(java.lang.String,com.android.tools.r8.graph.DexItemFactory):456:460 -> a
+    72:76:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):319 -> a
+    77:77:com.android.tools.r8.graph.DexAnnotation createSignatureAnnotation(java.lang.String,com.android.tools.r8.graph.DexItemFactory):318:318 -> a
+    78:80:com.android.tools.r8.graph.DexAnnotation createNestHostAnnotation(com.android.tools.r8.graph.NestHostClassAttribute,com.android.tools.r8.graph.DexItemFactory):324:324 -> a
+    81:88:com.android.tools.r8.graph.DexAnnotation createNestMembersAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):330:337 -> a
+    89:89:com.android.tools.r8.graph.DexAnnotation createNestMembersAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):334:334 -> a
+    90:95:java.lang.String getSignature(com.android.tools.r8.graph.DexAnnotation):353:358 -> a
+    96:96:com.android.tools.r8.graph.DexAnnotation createThrowsAnnotation(com.android.tools.r8.graph.DexValue[],com.android.tools.r8.graph.DexItemFactory):368:368 -> a
+    97:99: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):374:376 -> a
+    100:104:com.android.tools.r8.graph.DexValue getSystemValueAnnotationValue(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):381:385 -> a
+    105:137:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSynthesizedClassAnnotationInfo(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticItems):488:520 -> a
+    138:145:com.android.tools.r8.graph.DexAnnotation rewrite(java.util.function.Function):525:532 -> a
     1:1:com.android.tools.r8.graph.DexEncodedAnnotation lambda$specify$0(com.android.tools.r8.graph.DexAnnotation):60:60 -> b
     2:6:com.android.tools.r8.graph.DexMethod getEnclosingMethodFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):155:159 -> b
+    7:14:com.android.tools.r8.graph.DexAnnotation createPermittedSubclassesAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):342:349 -> b
+    15:15:com.android.tools.r8.graph.DexAnnotation createPermittedSubclassesAnnotation(java.util.List,com.android.tools.r8.graph.DexItemFactory):346:346 -> b
     1:1:int lambda$specify$1(com.android.tools.r8.graph.DexAnnotation):60:60 -> c
-    2:12:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):206:216 -> c
-    1:8:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):234:241 -> d
-    1:5:com.android.tools.r8.graph.DexType getNestHostFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):248:252 -> e
+    2:12:com.android.tools.r8.utils.Pair getInnerClassFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):211:221 -> c
+    1:8:java.util.List getMemberClassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):239:246 -> d
+    1:5:com.android.tools.r8.graph.DexType getNestHostFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):253:257 -> e
     1:3:boolean equals(java.lang.Object):92:94 -> equals
-    1:8:java.util.List getNestMembersFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):257:264 -> f
-    1:1:boolean isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):164:164 -> g
-    1:1:boolean isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):169:169 -> h
+    1:1:java.util.List getNestMembersFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):276:276 -> f
+    2:9:java.util.List getTypesFromAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):262:269 -> f
+    2:9:java.util.List getNestMembersFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):276 -> f
+    1:1:java.util.List getPermittedSubclassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):281:281 -> g
+    2:9:java.util.List getTypesFromAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):262:269 -> g
+    2:9:java.util.List getPermittedSubclassesFromAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):281 -> g
+    1:1:boolean isEnclosingClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):164:164 -> h
     1:1:int hashCode():84:84 -> hashCode
-    1:1:boolean isInnerClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):173:173 -> i
-    1:1:boolean isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):178:178 -> j
-    1:1:boolean isNestHostAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):182:182 -> k
-    1:1:boolean isNestMembersAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):186:186 -> l
+    1:1:boolean isEnclosingMethodAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):169:169 -> i
+    1:1:boolean isInnerClassAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):173:173 -> j
+    1:1:boolean isMemberClassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):178:178 -> k
+    1:1:boolean isNestHostAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):182:182 -> l
     1:1:com.android.tools.r8.graph.DexType getAnnotationType():79:79 -> l0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():75:75 -> m
-    2:2:boolean isSignatureAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):368:368 -> m
+    2:2:boolean isNestMembersAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):186:186 -> m
+    1:1:boolean isPermittedSubclassesAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):191:191 -> n
+    1:1:boolean isSignatureAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):395:395 -> o
     1:1:java.lang.String toString():101:101 -> toString
-com.android.tools.r8.graph.DexAnnotation$AnnotatedKind -> com.android.tools.r8.internal.Eg:
+com.android.tools.r8.graph.DexAnnotation$AnnotatedKind -> com.android.tools.r8.internal.Ig:
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind FIELD -> b
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind METHOD -> c
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind TYPE -> d
@@ -27042,7 +27166,7 @@
     1:2:void <init>(java.util.Collection):100:101 -> <init>
     1:1:java.util.Collection getClasses():114:114 -> a
     1:3:boolean reorderClasses():106:108 -> b
-com.android.tools.r8.graph.DexApplicationReadFlags -> com.android.tools.r8.internal.Fg:
+com.android.tools.r8.graph.DexApplicationReadFlags -> com.android.tools.r8.internal.Jg:
     boolean hasReadProgramClassFromDex -> a
     boolean hasReadProgramClassFromCf -> b
     boolean hasReadRecordReferenceFromProgramClass -> c
@@ -27050,7 +27174,7 @@
     1:1:boolean hasReadProgramClassFromCf():24:24 -> a
     1:1:boolean hasReadProgramClassFromDex():28:28 -> b
     1:1:boolean hasReadRecordReferenceFromProgramClass():32:32 -> c
-com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.Tg:
+com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.Xg:
     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):28:30 -> <init>
@@ -27080,7 +27204,7 @@
     60:60:void writeMarkers(java.io.PrintStream):53:53 -> e
     61:61:void writeMarkers(java.io.PrintStream):53:53 -> e
     56:58:void writeMarkers(java.io.PrintStream):53:55 -> e
-com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.Sg:
+com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.Wg:
     java.io.PrintStream get(com.android.tools.r8.graph.DexClass) -> a
 com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.H:
     com.android.tools.r8.graph.DexString methodName -> e
@@ -27213,7 +27337,7 @@
     107:108:java.lang.String build():283 -> a
     109:116:java.lang.String build():284:291 -> a
 com.android.tools.r8.graph.DexClass -> com.android.tools.r8.graph.I:
-    com.android.tools.r8.graph.GenericSignature$ClassSignature classSignature -> r
+    java.util.List permittedSubclasses -> r
     com.android.tools.r8.graph.ClassAccessFlags accessFlags -> f
     java.util.List nestMembers -> q
     com.android.tools.r8.graph.DexEncodedField[] instanceFields -> l
@@ -27221,8 +27345,9 @@
     java.util.List innerClasses -> o
     com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMethod -> n
     com.android.tools.r8.graph.MethodCollection methodCollection -> m
-    boolean $assertionsDisabled -> s
     com.android.tools.r8.utils.OptionalBool isResolvable -> j
+    com.android.tools.r8.graph.GenericSignature$ClassSignature classSignature -> s
+    boolean $assertionsDisabled -> t
     com.android.tools.r8.graph.NestHostClassAttribute nestHost -> p
     com.android.tools.r8.origin.Origin origin -> d
     com.android.tools.r8.graph.DexString sourceFile -> i
@@ -27230,343 +27355,354 @@
     com.android.tools.r8.graph.DexType superType -> g
     com.android.tools.r8.graph.DexType type -> e
     1:1:void <clinit>():44:44 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.MethodCollection$MethodCollectionFactory,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):103:103 -> <init>
-    2:71: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.MethodCollection$MethodCollectionFactory,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):58:127 -> <init>
-    72:72: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.MethodCollection$MethodCollectionFactory,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):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":466,"2":467,"3":468}}
-    466:466: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.MethodCollection$MethodCollectionFactory,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):127:127 -> <init>
-    467:467: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.MethodCollection$MethodCollectionFactory,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):127:127 -> <init>
-    468:468: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.MethodCollection$MethodCollectionFactory,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):127:127 -> <init>
-    199:203: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.MethodCollection$MethodCollectionFactory,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):127:131 -> <init>
-    204:204: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.MethodCollection$MethodCollectionFactory,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):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":472,"2":473,"3":474}}
-    472:472: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.MethodCollection$MethodCollectionFactory,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):131:131 -> <init>
-    473:473: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.MethodCollection$MethodCollectionFactory,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):131:131 -> <init>
-    474:474: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.MethodCollection$MethodCollectionFactory,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):131:131 -> <init>
-    335:337: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.MethodCollection$MethodCollectionFactory,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):131:133 -> <init>
-    338:338: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.MethodCollection$MethodCollectionFactory,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):123:123 -> <init>
-    339:339: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.MethodCollection$MethodCollectionFactory,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):0:0 -> <init>
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":475,"2":476,"3":477}}
-    475:475: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.MethodCollection$MethodCollectionFactory,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):123:123 -> <init>
-    476:476: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.MethodCollection$MethodCollectionFactory,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):123:123 -> <init>
-    477:477: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.MethodCollection$MethodCollectionFactory,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):123:123 -> <init>
-    462:462: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.MethodCollection$MethodCollectionFactory,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):123:123 -> <init>
-    1:1:java.util.List allMethodsSorted():315:315 -> A0
-    1:4:boolean verifyNoDuplicateFields():524:527 -> A1
-    5:5:boolean verifyNoDuplicateFields():0:0 -> A1
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":533,"2":534,"3":535}}
-    533:533:boolean verifyNoDuplicateFields():527:527 -> A1
-    534:534:boolean verifyNoDuplicateFields():527:527 -> A1
-    535:535:boolean verifyNoDuplicateFields():527:527 -> A1
-    532:532:boolean verifyNoDuplicateFields():527:527 -> A1
-    1:1:java.lang.Iterable classFields():206:206 -> B0
-    1:1:java.lang.Iterable virtualMethods():278:278 -> B1
-    1:1:java.lang.Iterable classMethods():233:233 -> C0
+    1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):106:106 -> <init>
+    2:76: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):58:132 -> <init>
+    77:77: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):0:0 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":486,"2":487,"3":488}}
+    486:486: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):132:132 -> <init>
+    487:487: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):132:132 -> <init>
+    488:488: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):132:132 -> <init>
+    209:213: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):132:136 -> <init>
+    214:214: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):0:0 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":492,"2":493,"3":494}}
+    492:492: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):136:136 -> <init>
+    493:493: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):136:136 -> <init>
+    494:494: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):136:136 -> <init>
+    350:352: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):136:138 -> <init>
+    353:353: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):128:128 -> <init>
+    354:354: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):0:0 -> <init>
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":495,"2":496,"3":497}}
+    495:495: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):128:128 -> <init>
+    496:496: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):128:128 -> <init>
+    497:497: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):128:128 -> <init>
+    482:482: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.MethodCollection$MethodCollectionFactory,com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,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):128:128 -> <init>
+    1:1:java.util.List allMethodsSorted():320:320 -> A0
+    1:1:java.lang.Iterable methods():242:242 -> A1
+    1:1:java.lang.Iterable classFields():211:211 -> B0
+    1:5:java.util.List staticFields():380:384 -> B1
+    1:1:java.lang.Iterable classMethods():238:238 -> C0
+    1:1:boolean validInterfaceSignatures():919:919 -> C1
+    2:2:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> C1
+    2:2:boolean validInterfaceSignatures():919 -> C1
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:4:boolean validInterfaceSignatures():919:920 -> C1
     com.android.tools.r8.graph.DexClass toSingleClassWithProgramOverLibrary() -> D
-    1:1:void clearClassSignature():1069:1069 -> D0
-    1:1:void clearEnclosingMethodAttribute():1055:1055 -> E0
-    1:1:void clearInnerClasses():1065:1065 -> F0
+    1:1:void clearClassSignature():1083:1083 -> D0
+    1:4:boolean verifyNoDuplicateFields():529:532 -> D1
+    5:5:boolean verifyNoDuplicateFields():0:0 -> D1
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":538,"2":539,"3":540}}
+    538:538:boolean verifyNoDuplicateFields():532:532 -> D1
+    539:539:boolean verifyNoDuplicateFields():532:532 -> D1
+    540:540:boolean verifyNoDuplicateFields():532:532 -> D1
+    537:537:boolean verifyNoDuplicateFields():532:532 -> D1
+    1:1:void clearEnclosingMethodAttribute():1069:1069 -> E0
+    1:1:java.lang.Iterable virtualMethods():283:283 -> E1
+    1:1:void clearInnerClasses():1079:1079 -> F0
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> G
-    1:2:com.android.tools.r8.graph.DexEncodedField[] clearInstanceFields():501:502 -> G0
-    1:1:void clearNestHost():1130:1130 -> H0
-    1:1:void clearNestMembers():1134:1134 -> I0
-    1:2:com.android.tools.r8.graph.DexEncodedField[] clearStaticFields():409:410 -> J0
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():1029:1030 -> K0
-    1:1:java.lang.Iterable directMethods():250:250 -> L0
-    1:1:java.lang.Iterable fields():210:210 -> M0
-    1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():186:186 -> N0
-    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():761:762 -> O0
-    1:1:com.android.tools.r8.references.ClassReference getClassReference():768:768 -> P0
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():1098:1098 -> Q0
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1047:1047 -> R0
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():1077:1078 -> S0
-    1:1:java.util.List getInnerClasses():1035:1035 -> T0
-    1:1:com.android.tools.r8.graph.DexTypeList getInterfaces():190:190 -> U0
-    1:5:com.android.tools.r8.graph.DexType getNestHost():1155:1159 -> V0
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():1170:1170 -> W0
+    1:2:com.android.tools.r8.graph.DexEncodedField[] clearInstanceFields():506:507 -> G0
+    1:1:void clearNestHost():1148:1148 -> H0
+    1:1:void clearNestMembers():1152:1152 -> I0
+    1:1:void clearPermittedSubclasses():1120:1120 -> J0
+    1:2:com.android.tools.r8.graph.DexEncodedField[] clearStaticFields():414:415 -> K0
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():1043:1044 -> L0
+    1:1:java.lang.Iterable directMethods():255:255 -> M0
+    1:1:java.lang.Iterable fields():215:215 -> N0
+    1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():191:191 -> O0
+    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():775:776 -> P0
+    1:1:com.android.tools.r8.references.ClassReference getClassReference():782:782 -> Q0
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():1112:1112 -> R0
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1061:1061 -> S0
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():1091:1092 -> T0
+    1:1:java.util.List getInnerClasses():1049:1049 -> U0
+    1:1:com.android.tools.r8.graph.DexTypeList getInterfaces():195:195 -> V0
+    1:5:com.android.tools.r8.graph.DexType getNestHost():1173:1177 -> W0
     boolean hasClassResolutionResult() -> X
-    1:1:java.util.List getNestMembersClassAttributes():1178:1178 -> X0
-    1:1:java.lang.String getSimpleName():1193:1193 -> Y0
-    1:1:com.android.tools.r8.graph.DexString getSourceFile():198:198 -> Z0
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():1188:1188 -> X0
+    1:1:java.util.List getNestMembersClassAttributes():1196:1196 -> Y0
+    1:1:java.util.List getPermittedSubclassAttributes():1212:1212 -> Z0
     void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer) -> a
     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$9(java.util.Iterator) -> a
-    1:1:void forEachClassResolutionResult(java.util.function.Consumer):145:145 -> a
-    2:2:void forEachClassFieldMatching(java.util.function.Predicate,java.util.function.Consumer):170:170 -> a
-    3:3:void forEachFieldMatching(java.util.function.Predicate,java.util.function.Consumer):343:343 -> a
-    3:3:void forEachClassFieldMatching(java.util.function.Predicate,java.util.function.Consumer):170 -> a
-    4:4:void lambda$forEachClassFieldMatching$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):170:170 -> a
-    5:5:void lambda$forEachClassMethodMatching$1(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):181:181 -> a
-    6:6:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):246:246 -> a
-    7:7:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):258:258 -> a
-    8:8:void addDirectMethods(java.util.Collection):262:262 -> a
-    9:9:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):274:274 -> a
-    10:10:void setVirtualMethods(java.util.List):290:290 -> a
-    11:11:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):294:294 -> a
-    11:11:void setVirtualMethods(java.util.List):290 -> a
-    12:12:void virtualizeMethods(java.util.Set):319:319 -> a
-    13:14:com.android.tools.r8.utils.TraversalContinuation traverseFields(java.util.function.Function):366:367 -> a
+    java.util.Iterator lambda$allImmediateSupertypes$11(java.util.Iterator) -> a
+    1:1:void forEachClassResolutionResult(java.util.function.Consumer):150:150 -> a
+    2:2:void forEachClassFieldMatching(java.util.function.Predicate,java.util.function.Consumer):175:175 -> a
+    3:3:void forEachFieldMatching(java.util.function.Predicate,java.util.function.Consumer):348:348 -> a
+    3:3:void forEachClassFieldMatching(java.util.function.Predicate,java.util.function.Consumer):175 -> a
+    4:4:void lambda$forEachClassFieldMatching$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):175:175 -> a
+    5:5:void lambda$forEachClassMethodMatching$1(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):186:186 -> a
+    6:6:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):251:251 -> a
+    7:7:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):263:263 -> a
+    8:8:void addDirectMethods(java.util.Collection):267:267 -> a
+    9:9:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):279:279 -> a
+    10:10:void setVirtualMethods(java.util.List):295:295 -> a
+    11:11:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):299:299 -> a
+    11:11:void setVirtualMethods(java.util.List):295 -> a
+    12:12:void virtualizeMethods(java.util.Set):324:324 -> a
+    13:14:com.android.tools.r8.utils.TraversalContinuation traverseFields(java.util.function.Function):371:372 -> a
     15:15:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():151:151 -> a
-    15:15:com.android.tools.r8.utils.TraversalContinuation traverseFields(java.util.function.Function):367 -> a
+    15:15:com.android.tools.r8.utils.TraversalContinuation traverseFields(java.util.function.Function):372 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:19:com.android.tools.r8.utils.TraversalContinuation traverseFields(java.util.function.Function):368:371 -> a
-    20:25:void appendInstanceField(com.android.tools.r8.graph.DexEncodedField):459:464 -> a
-    26:28:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):489:491 -> a
-    29:30:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):495:496 -> a
-    31:32:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):517:518 -> a
-    31:32:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):496 -> a
-    33:33:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):497:497 -> a
+    16:19:com.android.tools.r8.utils.TraversalContinuation traverseFields(java.util.function.Function):373:376 -> a
+    20:25:void appendInstanceField(com.android.tools.r8.graph.DexEncodedField):464:469 -> a
+    26:28:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):494:496 -> a
+    29:30:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):500:501 -> a
+    31:32:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):522:523 -> a
+    31:32:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):501 -> a
+    33:33:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):502:502 -> a
     34:34:java.lang.Object com.android.tools.r8.com.google.common.base.MoreObjects.firstNonNull(java.lang.Object,java.lang.Object):64:64 -> a
-    34:34:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):495 -> a
-    35:36:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):566:567 -> a
-    37:37:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):601:601 -> a
-    38:38:com.android.tools.r8.graph.DexClassAndMethod toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):605:605 -> a
-    38:38:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):601 -> a
-    39:39:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):614:614 -> a
-    40:42:boolean isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):647:647 -> a
-    44:47:boolean isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):649:652 -> a
-    48:50:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):808:810 -> a
-    51:51:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):862:862 -> a
-    52:52:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):868:868 -> a
-    52:52:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):862 -> a
-    53:53:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):867:867 -> a
-    53:53:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):862 -> a
-    54:54:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):868:868 -> a
-    55:55:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):867:867 -> a
-    56:56:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):874:874 -> a
-    57:57:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):868:868 -> a
-    57:57:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):874 -> a
-    58:58:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):867:867 -> a
-    58:58:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):874 -> a
-    59:59:boolean lambda$classInitializationMayHaveSideEffectsInContext$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):875:875 -> a
-    60:63:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):911:914 -> a
-    64:64:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
-    64:64:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):914 -> a
+    34:34:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):500 -> a
+    35:35:boolean lambda$lookupUniqueInstanceFieldWithName$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedField):548:548 -> a
+    36:36:com.android.tools.r8.graph.DexEncodedField lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):548:548 -> a
+    37:38:com.android.tools.r8.graph.DexEncodedField internalLookupUniqueFieldThatMatches(java.util.function.Predicate,java.util.List):558:559 -> a
+    37:38:com.android.tools.r8.graph.DexEncodedField lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):548 -> a
+    39:40:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):580:581 -> a
+    41:41:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):615:615 -> a
+    42:42:com.android.tools.r8.graph.DexClassAndMethod toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> a
+    42:42:com.android.tools.r8.graph.DexClassAndMethod lookupClassMethod(com.android.tools.r8.graph.DexMethod):615 -> a
+    43:43:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):628:628 -> a
+    44:46:boolean isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):661:661 -> a
+    48:51:boolean isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):663:666 -> a
+    52:54:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):822:824 -> a
+    55:55:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):876:876 -> a
+    56:56:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):882:882 -> a
+    56:56:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):876 -> a
+    57:57:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):881:881 -> a
+    57:57:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):876 -> a
+    58:58:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):882:882 -> a
+    59:59:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):881:881 -> a
+    60:60:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):888:888 -> a
+    61:61:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):882:882 -> a
+    61:61:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):888 -> a
+    62:62:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate):881:881 -> a
+    62:62:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):888 -> a
+    63:63:boolean lambda$classInitializationMayHaveSideEffectsInContext$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):889:889 -> a
+    64:67:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):925:928 -> a
+    68:68:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
+    68:68:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):928 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    65:66:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):914:915 -> a
-    67:68:void forEachImmediateInterface(java.util.function.Consumer):885:886 -> a
-    67:68:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):915 -> a
-    69:71:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):921:923 -> a
-    72:72:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
-    72:72:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):923 -> a
+    69:70:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):928:929 -> a
+    71:72:void forEachImmediateInterface(java.util.function.Consumer):899:900 -> a
+    71:72:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):929 -> a
+    73:75:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):935:937 -> a
+    76:76:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
+    76:76:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):937 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    73:79:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):923:929 -> a
-    80:83:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):944:947 -> a
-    84:84:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
-    84:84:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):947 -> a
+    77:83:void forEachImmediateInterfaceWithSignature(java.util.function.BiConsumer):937:943 -> a
+    84:87:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):958:961 -> a
+    88:88:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
+    88:88:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):961 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    85:86:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):947:948 -> a
-    87:88:void forEachImmediateInterface(java.util.function.Consumer):885:886 -> a
-    87:88:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):948 -> a
-    89:91:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):953:955 -> a
-    92:92:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
-    92:92:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):955 -> a
+    89:90:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):961:962 -> a
+    91:92:void forEachImmediateInterface(java.util.function.Consumer):899:900 -> a
+    91:92:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):962 -> a
+    93:95:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):967:969 -> a
+    96:96:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> a
+    96:96:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):969 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    93:101:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):955:963 -> a
-    102:102:boolean com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.hasTypeVariableArguments():651:651 -> a
-    102:102:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):963 -> a
+    97:105:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):969:977 -> a
+    106:106:boolean com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.hasTypeVariableArguments():651:651 -> a
+    106:106:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):977 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    103:104:boolean com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.hasTypeVariableArguments():651:652 -> a
-    103:104:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):963 -> a
-    105:111:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):964:970 -> a
-    112:112:void lambda$forEachImmediateInterfaceWithAppliedTypeArguments$7(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):949:949 -> a
-    113:115:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):985:987 -> a
-    116:116:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():605:605 -> a
-    116:116:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):990 -> a
-    117:138:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):990:1011 -> a
-    139:140:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):993:994 -> a
-    141:141:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
-    141:141:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):994 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    142:144:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):994:996 -> a
+    107:108:boolean com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.hasTypeVariableArguments():651:652 -> a
+    107:108:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):977 -> a
+    109:115:void forEachImmediateInterfaceWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):978:984 -> a
+    116:116:void lambda$forEachImmediateInterfaceWithAppliedTypeArguments$9(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):963:963 -> a
+    117:119:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):999:1001 -> a
+    120:120:java.util.List com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.typeArguments():605:605 -> a
+    120:120:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):1004 -> a
+    121:142:java.util.List applyTypeArguments(com.android.tools.r8.graph.GenericSignature$ClassTypeSignature,java.util.List):1004:1025 -> a
+    143:144:void lambda$applyTypeArguments$10(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):1007:1008 -> a
     145:145:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
-    145:145:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):996 -> a
+    145:145:void lambda$applyTypeArguments$10(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):1008 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    146:146:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):996:996 -> a
-    147:147:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():182:182 -> a
-    147:147:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):998 -> a
+    146:148:void lambda$applyTypeArguments$10(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):1008:1010 -> a
+    149:149:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
+    149:149:void lambda$applyTypeArguments$10(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):1010 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    148:148:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):999:999 -> a
-    149:149:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():747:747 -> a
-    149:149:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):999 -> a
+    150:150:void lambda$applyTypeArguments$10(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):1010:1010 -> a
+    151:151:java.lang.String com.android.tools.r8.graph.GenericSignature$FormalTypeParameter.getName():182:182 -> a
+    151:151:void lambda$applyTypeArguments$10(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):1012 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    150:159:void lambda$applyTypeArguments$8(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):999:1008 -> a
-    160:160:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):1025:1025 -> a
-    161:161:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):582:582 -> a
-    161:161:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):1025 -> a
-    162:162:void setInnerClasses(java.util.List):1039:1039 -> a
-    163:163:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):1051:1051 -> a
-    164:164:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):1102:1102 -> a
-    165:166:void setNestHost(com.android.tools.r8.graph.DexType):1138:1139 -> a
-    167:167:void setNestHostAttribute(com.android.tools.r8.graph.NestHostClassAttribute):1143:1143 -> a
-    168:168:void lambda$forEachNestMember$11(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):1166:1166 -> a
-    169:169:boolean isValid(com.android.tools.r8.utils.InternalOptions):1230:1230 -> a
-    170:172:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):299:301 -> a
-    170:172:boolean isValid(com.android.tools.r8.utils.InternalOptions):1230 -> a
-    173:173:boolean isValid(com.android.tools.r8.utils.InternalOptions):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":181,"2":182,"3":183}}
-    181:181:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):301:301 -> a
-    181:181:boolean isValid(com.android.tools.r8.utils.InternalOptions):1230 -> a
-    182:182:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):301:301 -> a
-    182:182:boolean isValid(com.android.tools.r8.utils.InternalOptions):1230 -> a
-    183:183:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):301:301 -> a
-    183:183:boolean isValid(com.android.tools.r8.utils.InternalOptions):1230 -> a
-    174:174:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):303:303 -> a
-    174:174:boolean isValid(com.android.tools.r8.utils.InternalOptions):1230 -> a
-    175:176:boolean isValid(com.android.tools.r8.utils.InternalOptions):1231:1232 -> a
-    177:178:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):517:518 -> a
-    177:178:boolean isValid(com.android.tools.r8.utils.InternalOptions):1232 -> a
-    179:180:boolean isValid(com.android.tools.r8.utils.InternalOptions):1233:1234 -> a
-    1:1:com.android.tools.r8.graph.DexType getSuperType():796:796 -> a1
+    152:152:void lambda$applyTypeArguments$10(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):1013:1013 -> a
+    153:153:java.lang.String com.android.tools.r8.graph.GenericSignature$TypeVariableSignature.typeVariable():747:747 -> a
+    153:153:void lambda$applyTypeArguments$10(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):1013 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    154:163:void lambda$applyTypeArguments$10(java.util.List,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):1013:1022 -> a
+    164:164:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):1039:1039 -> a
+    165:165:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):596:596 -> a
+    165:165:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):1039 -> a
+    166:166:void setInnerClasses(java.util.List):1053:1053 -> a
+    167:167:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):1065:1065 -> a
+    168:168:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):1116:1116 -> a
+    169:170:void setNestHost(com.android.tools.r8.graph.DexType):1156:1157 -> a
+    171:171:void setNestHostAttribute(com.android.tools.r8.graph.NestHostClassAttribute):1161:1161 -> a
+    172:172:void lambda$forEachNestMember$13(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):1184:1184 -> a
+    173:173:boolean isValid(com.android.tools.r8.utils.InternalOptions):1256:1256 -> a
+    174:176:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):304:306 -> a
+    174:176:boolean isValid(com.android.tools.r8.utils.InternalOptions):1256 -> a
+    177:177:boolean isValid(com.android.tools.r8.utils.InternalOptions):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":185,"2":186,"3":187}}
+    185:185:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):306:306 -> a
+    185:185:boolean isValid(com.android.tools.r8.utils.InternalOptions):1256 -> a
+    186:186:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):306:306 -> a
+    186:186:boolean isValid(com.android.tools.r8.utils.InternalOptions):1256 -> a
+    187:187:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):306:306 -> a
+    187:187:boolean isValid(com.android.tools.r8.utils.InternalOptions):1256 -> a
+    178:178:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):308:308 -> a
+    178:178:boolean isValid(com.android.tools.r8.utils.InternalOptions):1256 -> a
+    179:180:boolean isValid(com.android.tools.r8.utils.InternalOptions):1257:1258 -> a
+    181:182:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):522:523 -> a
+    181:182:boolean isValid(com.android.tools.r8.utils.InternalOptions):1258 -> a
+    183:184:boolean isValid(com.android.tools.r8.utils.InternalOptions):1259:1260 -> a
+    1:1:java.lang.String getSimpleName():1219:1219 -> a1
     com.android.tools.r8.graph.DexClass getContextClass() -> b
-    1:1:void forEachClassField(java.util.function.Consumer):165:165 -> b
-    2:2:void forEachClassMethodMatching(java.util.function.Predicate,java.util.function.Consumer):180:180 -> b
-    3:3:com.android.tools.r8.graph.DexClassAndMethod lambda$classMethods$3(com.android.tools.r8.graph.DexEncodedMethod):233:233 -> b
-    4:4:java.lang.Iterable directMethods(java.util.function.Predicate):254:254 -> b
-    5:5:void addVirtualMethods(java.util.Collection):286:286 -> b
-    6:6:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):294:294 -> b
-    7:12:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):387:392 -> b
-    13:15:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):422:424 -> b
-    16:17:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):428:429 -> b
-    18:19:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):517:518 -> b
-    18:19:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):429 -> b
-    20:20:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):430:430 -> b
+    1:1:void forEachClassField(java.util.function.Consumer):170:170 -> b
+    2:2:void forEachClassMethodMatching(java.util.function.Predicate,java.util.function.Consumer):185:185 -> b
+    3:3:com.android.tools.r8.graph.DexClassAndMethod lambda$classMethods$3(com.android.tools.r8.graph.DexEncodedMethod):238:238 -> b
+    4:4:java.lang.Iterable directMethods(java.util.function.Predicate):259:259 -> b
+    5:5:void addVirtualMethods(java.util.Collection):291:291 -> b
+    6:6:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):299:299 -> b
+    7:12:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):392:397 -> b
+    13:15:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):427:429 -> b
+    16:17:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):433:434 -> b
+    18:19:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):522:523 -> b
+    18:19:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):434 -> b
+    20:20:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):435:435 -> b
     21:21:java.lang.Object com.android.tools.r8.com.google.common.base.MoreObjects.firstNonNull(java.lang.Object,java.lang.Object):64:64 -> b
-    21:21:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):428 -> b
-    22:22:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):539:539 -> b
-    23:24:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):657:658 -> b
-    23:24:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):539 -> b
-    25:25:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):572:572 -> b
-    26:26:boolean isFinal():678:678 -> b
-    26:26:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):682 -> b
-    27:30:void forEachImmediateSupertype(java.util.function.BiConsumer):898:901 -> b
-    31:32:void forEachImmediateInterface(java.util.function.Consumer):885:886 -> b
-    31:32:void forEachImmediateSupertype(java.util.function.BiConsumer):901 -> b
-    33:33:void lambda$forEachImmediateInterfaceWithSignature$6(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):917:917 -> b
-    34:36:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):976:978 -> b
-    37:40:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):977:980 -> b
-    41:41:void setNestMemberAttributes(java.util.List):1182:1182 -> b
-    1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():229:229 -> b0
-    1:1:java.lang.String getTypeName():1197:1197 -> b1
-    1:1:void forEachClassMethod(java.util.function.Consumer):175:175 -> c
-    2:2:com.android.tools.r8.graph.DexClassAndField lambda$classFields$2(com.android.tools.r8.graph.DexEncodedField):206:206 -> c
-    3:5:java.lang.Iterable fields(java.util.function.Predicate):214:216 -> c
+    21:21:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):433 -> b
+    22:22:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):544:544 -> b
+    23:24:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):671:672 -> b
+    23:24:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):544 -> b
+    25:25:boolean lambda$lookupUniqueStaticFieldWithName$5(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedField):552:552 -> b
+    26:26:com.android.tools.r8.graph.DexEncodedField lookupUniqueStaticFieldWithName(com.android.tools.r8.graph.DexString):552:552 -> b
+    27:28:com.android.tools.r8.graph.DexEncodedField internalLookupUniqueFieldThatMatches(java.util.function.Predicate,java.util.List):558:559 -> b
+    27:28:com.android.tools.r8.graph.DexEncodedField lookupUniqueStaticFieldWithName(com.android.tools.r8.graph.DexString):552 -> b
+    29:29:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):586:586 -> b
+    30:30:boolean isFinal():692:692 -> b
+    30:30:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):696 -> b
+    31:34:void forEachImmediateSupertype(java.util.function.BiConsumer):912:915 -> b
+    35:36:void forEachImmediateInterface(java.util.function.Consumer):899:900 -> b
+    35:36:void forEachImmediateSupertype(java.util.function.BiConsumer):915 -> b
+    37:37:void lambda$forEachImmediateInterfaceWithSignature$8(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):931:931 -> b
+    38:40:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):990:992 -> b
+    41:44:void forEachImmediateSupertypeWithAppliedTypeArguments(java.util.List,java.util.function.BiConsumer):991:994 -> b
+    45:45:void setNestMemberAttributes(java.util.List):1200:1200 -> b
+    1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():234:234 -> b0
+    1:1:com.android.tools.r8.graph.DexString getSourceFile():203:203 -> b1
+    1:1:void forEachClassMethod(java.util.function.Consumer):180:180 -> c
+    2:2:com.android.tools.r8.graph.DexClassAndField lambda$classFields$2(com.android.tools.r8.graph.DexEncodedField):211:211 -> c
+    3:5:java.lang.Iterable fields(java.util.function.Predicate):219:221 -> c
     6:6:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> c
-    6:6:java.lang.Iterable fields(java.util.function.Predicate):214 -> c
-    7:7:void forEachFieldMatching(java.util.function.Predicate,java.util.function.Consumer):343:343 -> c
-    8:16:void appendStaticFields(java.util.Collection):396:404 -> c
-    17:18:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):517:518 -> c
-    17:18:void appendStaticFields(java.util.Collection):404 -> c
-    19:19:void appendStaticFields(java.util.Collection):405:405 -> c
-    20:20:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):534:534 -> c
-    21:22:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):657:658 -> c
-    21:22:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):534 -> c
-    23:23:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):610:610 -> c
-    24:31:boolean isResolvable(com.android.tools.r8.graph.AppView):834:841 -> c
+    6:6:java.lang.Iterable fields(java.util.function.Predicate):219 -> c
+    7:7:void forEachFieldMatching(java.util.function.Predicate,java.util.function.Consumer):348:348 -> c
+    8:16:void appendStaticFields(java.util.Collection):401:409 -> c
+    17:18:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):522:523 -> c
+    17:18:void appendStaticFields(java.util.Collection):409 -> c
+    19:19:void appendStaticFields(java.util.Collection):410:410 -> c
+    20:20:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):539:539 -> c
+    21:22:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):671:672 -> c
+    21:22:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):539 -> c
+    23:23:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):624:624 -> c
+    24:31:boolean isResolvable(com.android.tools.r8.graph.AppView):848:855 -> c
     32:33:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):368:369 -> c
-    32:33:boolean isResolvable(com.android.tools.r8.graph.AppView):841 -> c
-    34:37:boolean isResolvable(com.android.tools.r8.graph.AppView):847:850 -> c
-    38:38:void lambda$forEachImmediateSupertype$5(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):901:901 -> c
-    39:42:void forEachImmediateSupertypeWithSignature(java.util.function.BiConsumer):935:938 -> c
-    1:1:boolean hasClassInitializer():800:800 -> c1
-    1:1:void setDirectMethods(java.util.Collection):270:270 -> d
-    2:2:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):274:274 -> d
-    2:2:void setDirectMethods(java.util.Collection):270 -> d
-    3:3:void forEachField(java.util.function.Consumer):338:338 -> d
-    4:4:void forEachFieldMatching(java.util.function.Predicate,java.util.function.Consumer):343:343 -> d
-    4:4:void forEachField(java.util.function.Consumer):338 -> d
-    5:5:java.lang.Iterable instanceFields(java.util.function.Predicate):455:455 -> d
-    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):582:582 -> d
-    7:7:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$10(com.android.tools.r8.graph.DexEncodedField):1031:1031 -> d
-    1:1:boolean hasEnclosingMethodAttribute():1043:1043 -> d1
-    1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):266:266 -> e
-    2:2:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):507:507 -> e
+    32:33:boolean isResolvable(com.android.tools.r8.graph.AppView):855 -> c
+    34:37:boolean isResolvable(com.android.tools.r8.graph.AppView):861:864 -> c
+    38:38:void lambda$forEachImmediateSupertype$7(java.util.function.BiConsumer,com.android.tools.r8.graph.DexType):915:915 -> c
+    39:42:void forEachImmediateSupertypeWithSignature(java.util.function.BiConsumer):949:952 -> c
+    1:1:com.android.tools.r8.graph.DexType getSuperType():810:810 -> c1
+    1:1:void setDirectMethods(java.util.Collection):275:275 -> d
+    2:2:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):279:279 -> d
+    2:2:void setDirectMethods(java.util.Collection):275 -> d
+    3:3:void forEachField(java.util.function.Consumer):343:343 -> d
+    4:4:void forEachFieldMatching(java.util.function.Predicate,java.util.function.Consumer):348:348 -> d
+    4:4:void forEachField(java.util.function.Consumer):343 -> d
+    5:5:java.lang.Iterable instanceFields(java.util.function.Predicate):460:460 -> d
+    6:6:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):596:596 -> d
+    7:7:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$12(com.android.tools.r8.graph.DexEncodedField):1045:1045 -> d
+    1:1:java.lang.String getTypeName():1223:1223 -> d1
+    1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):271:271 -> e
+    2:2:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):512:512 -> e
     3:3:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1025,"2":1026,"3":1027}}
-    1025:1025:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):507:507 -> e
-    1026:1026:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):507:507 -> e
-    1027:1027:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):507:507 -> e
-    512:512:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):509:509 -> e
-    513:513:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1031,"2":1032,"3":1033,"4":1034}}
-    1031:1031:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):511:511 -> e
-    1032:1032:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):511:511 -> e
-    1033:1033:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):511:511 -> e
-    1034:1034:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):511:511 -> e
-    1024:1024:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):511:511 -> e
-    1035:1035:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):577:577 -> e
-    1036:1037:void forEachImmediateSupertype(java.util.function.Consumer):891:892 -> e
-    1038:1039:void forEachImmediateInterface(java.util.function.Consumer):885:886 -> e
-    1038:1039:void forEachImmediateSupertype(java.util.function.Consumer):894 -> e
-    1:1:boolean hasInstanceFields():1205:1205 -> e1
-    1:1:void forEachInstanceField(java.util.function.Consumer):347:347 -> f
-    2:2:void forEachInstanceFieldMatching(java.util.function.Predicate,java.util.function.Consumer):352:352 -> f
-    2:2:void forEachInstanceField(java.util.function.Consumer):347 -> f
-    3:3:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):587:587 -> f
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1035,"2":1036,"3":1037}}
+    1035:1035:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):512:512 -> e
+    1036:1036:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):512:512 -> e
+    1037:1037:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):512:512 -> e
+    517:517:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):514:514 -> e
+    518:518:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):0:0 -> e
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1041,"2":1042,"3":1043,"4":1044}}
+    1041:1041:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):516:516 -> e
+    1042:1042:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):516:516 -> e
+    1043:1043:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):516:516 -> e
+    1044:1044:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):516:516 -> e
+    1034:1034:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):516:516 -> e
+    1045:1045:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):591:591 -> e
+    1046:1047:void forEachImmediateSupertype(java.util.function.Consumer):905:906 -> e
+    1048:1049:void forEachImmediateInterface(java.util.function.Consumer):899:900 -> e
+    1048:1049:void forEachImmediateSupertype(java.util.function.Consumer):908 -> e
+    1:1:boolean hasClassInitializer():814:814 -> e1
+    1:1:void forEachInstanceField(java.util.function.Consumer):352:352 -> f
+    2:2:void forEachInstanceFieldMatching(java.util.function.Predicate,java.util.function.Consumer):357:357 -> f
+    2:2:void forEachInstanceField(java.util.function.Consumer):352 -> f
+    3:3:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):601:601 -> f
     boolean isLibraryClass() -> f0
-    1:1:boolean hasNestMemberAttributes():1174:1174 -> f1
-    1:1:java.lang.Iterable members(java.util.function.Predicate):224:224 -> g
-    2:2:java.lang.Iterable methods(java.util.function.Predicate):241:241 -> g
-    2:2:java.lang.Iterable members(java.util.function.Predicate):224 -> g
+    1:1:boolean hasEnclosingMethodAttribute():1057:1057 -> f1
+    1:1:java.lang.Iterable members(java.util.function.Predicate):229:229 -> g
+    2:2:java.lang.Iterable methods(java.util.function.Predicate):246:246 -> g
+    2:2:java.lang.Iterable members(java.util.function.Predicate):229 -> g
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> g
-    3:3:java.lang.Iterable members(java.util.function.Predicate):224 -> g
-    4:4:void forEachMethod(java.util.function.Consumer):311:311 -> g
+    3:3:java.lang.Iterable members(java.util.function.Predicate):229 -> g
+    4:4:void forEachMethod(java.util.function.Consumer):316:316 -> g
     5:5:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):126:126 -> g
-    5:5:void forEachMethod(java.util.function.Consumer):311 -> g
+    5:5:void forEachMethod(java.util.function.Consumer):316 -> g
     6:6:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):126:126 -> g
-    6:6:void forEachMethod(java.util.function.Consumer):311 -> g
+    6:6:void forEachMethod(java.util.function.Consumer):316 -> g
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     com.android.tools.r8.graph.DexClass toAlternativeClassWithProgramOverLibrary() -> g0
-    1:1:boolean hasStaticFields():1201:1201 -> g1
+    1:1:boolean hasInstanceFields():1231:1231 -> g1
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():44:44 -> getAccessFlags
-    1:1:com.android.tools.r8.origin.Origin getOrigin():783:783 -> getOrigin
-    1:1:com.android.tools.r8.graph.DexReference getReference():702:702 -> getReference
-    1:1:com.android.tools.r8.graph.DexType getType():788:788 -> getType
-    1:1:java.lang.Iterable methods(java.util.function.Predicate):241:241 -> h
-    2:3:void forEachNestMember(java.util.function.Consumer):1165:1166 -> h
-    1:5:java.util.List instanceFields():447:451 -> h1
-    1:1:void forEachStaticField(java.util.function.Consumer):356:356 -> i
-    2:2:java.lang.Iterable staticFields(java.util.function.Predicate):383:383 -> i
-    2:2:void forEachStaticFieldMatching(java.util.function.Predicate,java.util.function.Consumer):361 -> i
-    2:2:void forEachStaticField(java.util.function.Consumer):356 -> i
-    3:3:void forEachStaticFieldMatching(java.util.function.Predicate,java.util.function.Consumer):361:361 -> i
-    3:3:void forEachStaticField(java.util.function.Consumer):356 -> i
-    4:5:void removeEnclosingMethodAttribute(java.util.function.Predicate):1059:1060 -> i
-    1:1:boolean isAbstract():670:670 -> i1
-    1:1:boolean isInterface():687:687 -> isInterface
-    1:1:void removeInnerClasses(java.util.function.Predicate):1073:1073 -> j
-    1:1:boolean isAnnotation():674:674 -> j1
-    1:1:void removeNestMemberAttributes(java.util.function.Predicate):1186:1186 -> k
-    1:4:boolean isAnonymousClass():1119:1122 -> k1
+    1:1:com.android.tools.r8.origin.Origin getOrigin():797:797 -> getOrigin
+    1:1:com.android.tools.r8.graph.DexReference getReference():716:716 -> getReference
+    1:1:com.android.tools.r8.graph.DexType getType():802:802 -> getType
+    1:1:java.lang.Iterable methods(java.util.function.Predicate):246:246 -> h
+    2:3:void forEachNestMember(java.util.function.Consumer):1183:1184 -> h
+    1:1:boolean hasNestMemberAttributes():1192:1192 -> h1
+    1:1:void forEachStaticField(java.util.function.Consumer):361:361 -> i
+    2:2:java.lang.Iterable staticFields(java.util.function.Predicate):388:388 -> i
+    2:2:void forEachStaticFieldMatching(java.util.function.Predicate,java.util.function.Consumer):366 -> i
+    2:2:void forEachStaticField(java.util.function.Consumer):361 -> i
+    3:3:void forEachStaticFieldMatching(java.util.function.Predicate,java.util.function.Consumer):366:366 -> i
+    3:3:void forEachStaticField(java.util.function.Consumer):361 -> i
+    4:5:void removeEnclosingMethodAttribute(java.util.function.Predicate):1073:1074 -> i
+    1:1:boolean hasPermittedSubclassAttributes():1208:1208 -> i1
+    1:1:boolean isInterface():701:701 -> isInterface
+    1:1:void removeInnerClasses(java.util.function.Predicate):1087:1087 -> j
+    1:1:boolean hasStaticFields():1227:1227 -> j1
+    1:1:void removeNestMemberAttributes(java.util.function.Predicate):1204:1204 -> k
+    1:5:java.util.List instanceFields():452:456 -> k1
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> l
-    1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):282:282 -> l
-    boolean isClasspathClass() -> l1
+    1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):287:287 -> l
+    1:1:boolean isAbstract():684:684 -> l1
     com.android.tools.r8.graph.DexClass asDexClass() -> m0
-    1:1:boolean isEnum():691:691 -> m1
-    1:1:boolean isFinal():678:678 -> n1
-    1:1:boolean isInANest():1126:1126 -> o1
-    1:3:boolean isLocalClass():1106:1108 -> p1
-    1:3:boolean isMemberClass():1112:1114 -> q1
-    1:1:boolean isNestHost():1147:1147 -> r1
-    1:1:boolean isNestMember():1151:1151 -> s1
+    1:1:boolean isAnnotation():688:688 -> m1
+    1:4:boolean isAnonymousClass():1137:1140 -> n1
+    boolean isClasspathClass() -> o1
+    1:1:boolean isEnum():705:705 -> p1
+    1:1:boolean isFinal():692:692 -> q1
+    1:1:boolean isInANest():1144:1144 -> r1
+    1:3:boolean isLocalClass():1124:1126 -> s1
     boolean isDexClass() -> t0
-    boolean isNotProgramClass() -> t1
-    1:1:boolean isPublic():747:747 -> u1
-    1:1:boolean isRecord():695:695 -> v1
-    1:1:java.lang.Iterable members():220:220 -> w1
-    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> w1
-    2:2:java.lang.Iterable members():220 -> w1
-    1:1:java.lang.Iterable methods():237:237 -> x1
+    1:3:boolean isMemberClass():1130:1132 -> t1
+    1:1:boolean isNestHost():1165:1165 -> u1
+    1:1:boolean isNestMember():1169:1169 -> v1
+    boolean isNotProgramClass() -> w1
+    1:1:boolean isPublic():761:761 -> x1
     boolean isStaticMember() -> y0
-    1:5:java.util.List staticFields():375:379 -> y1
-    1:3:java.lang.Iterable allImmediateSupertypes():1017:1019 -> z0
-    4:7:java.lang.Iterable allImmediateSupertypes():1018:1021 -> z0
-    1:1:boolean validInterfaceSignatures():905:905 -> z1
-    2:2:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.superInterfaceSignatures():233:233 -> z1
-    2:2:boolean validInterfaceSignatures():905 -> z1
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:4:boolean validInterfaceSignatures():905:906 -> z1
-com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.internal.Vg:
+    1:1:boolean isRecord():709:709 -> y1
+    1:3:java.lang.Iterable allImmediateSupertypes():1031:1033 -> z0
+    4:7:java.lang.Iterable allImmediateSupertypes():1032:1035 -> z0
+    1:1:java.lang.Iterable members():225:225 -> z1
+    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> z1
+    2:2:java.lang.Iterable members():225 -> z1
+com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.internal.Zg:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.J:
     boolean $assertionsDisabled -> e
@@ -27634,23 +27770,23 @@
     2:2:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethod.getSignature():173 -> y
     2:2:com.android.tools.r8.graph.DexMethodSignature getMethodSignature():53 -> y
 com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.M:
-    boolean $assertionsDisabled -> t
+    boolean $assertionsDisabled -> u
     1:1:void <clinit>():25:25 -> <clinit>
-    1:18: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.MethodCollection$MethodCollectionFactory,boolean):46:63 -> <init>
+    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,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.MethodCollection$MethodCollectionFactory,boolean):47:65 -> <init>
     com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> A
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
-    1:1:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):71:71 -> a
-    2:5:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):135:138 -> a
-    6:18:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):152:164 -> a
-    19:19:boolean lambda$specify$1(com.android.tools.r8.graph.DexClasspathClass):161:161 -> a
-    1:1:void lambda$forEachClasspathMethodMatching$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):81:81 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$2(com.android.tools.r8.graph.DexClasspathClass):162:162 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$3(com.android.tools.r8.graph.DexClasspathClass):163:163 -> c
-    1:1:void forEachClasspathMethodMatching(java.util.function.Predicate,java.util.function.Consumer):80:80 -> d
+    1:1:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):73:73 -> a
+    2:5:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):137:140 -> a
+    6:18:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):154:166 -> a
+    19:19:boolean lambda$specify$1(com.android.tools.r8.graph.DexClasspathClass):163:163 -> a
+    1:1:void lambda$forEachClasspathMethodMatching$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):83:83 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$2(com.android.tools.r8.graph.DexClasspathClass):164:164 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$3(com.android.tools.r8.graph.DexClasspathClass):165:165 -> c
+    1:1:void forEachClasspathMethodMatching(java.util.function.Predicate,java.util.function.Consumer):82:82 -> d
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> l
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():148:148 -> m
-    boolean isNotProgramClass() -> t1
-    1:1:java.lang.String toString():86:86 -> toString
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():150:150 -> m
+    1:1:java.lang.String toString():88:88 -> toString
+    boolean isNotProgramClass() -> w1
 com.android.tools.r8.graph.DexCode -> com.android.tools.r8.graph.N:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexDebugInfoForWriting debugInfoForWriting -> l
@@ -27766,7 +27902,7 @@
     236:236:void com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):882 -> a
     236:236:void com.android.tools.r8.graph.DexCode$TryHandler.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):818 -> a
     236:236:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):610 -> a
-    237:237:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    237:237:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     237:237:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     237:237:void com.android.tools.r8.graph.DexCode$TryHandler$TypeAddrPair.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):882 -> a
     237:237:void com.android.tools.r8.graph.DexCode$TryHandler.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):818 -> a
@@ -27873,7 +28009,7 @@
     1:1:com.android.tools.r8.graph.DexType getType():873:873 -> getType
     1:1:int hashCode():893:893 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():869:869 -> m
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.Xg:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.bh:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexMethod outlineCallee -> k
@@ -28079,14 +28215,14 @@
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):512:512 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):528:528 -> a
-    3:3:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    3:3:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     3:3:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):528 -> a
     4:4:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):533:533 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):554:554 -> b
-    2:2:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> b
+    2:2:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):69:69 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugEvent,com.android.tools.r8.utils.structural.CompareToVisitor):554 -> b
     3:3:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):559:559 -> b
-    4:4:void com.android.tools.r8.graph.DexString.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):70:70 -> b
+    4:4:void com.android.tools.r8.graph.DexString.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74:74 -> b
     4:4:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):559 -> b
     1:2:int hashCode():543:544 -> hashCode
     int getCompareToId() -> m0
@@ -28140,7 +28276,7 @@
     13:13:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):346 -> a
     14:16:void internalWriteOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):346:348 -> a
     17:17:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):354:354 -> a
-    18:18:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    18:18:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     18:18:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):355 -> a
     19:20:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):357:358 -> a
     21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
@@ -28156,11 +28292,11 @@
     388:388:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):359 -> a
     389:389:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     389:389:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):359 -> a
-    390:390:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    390:390:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     390:390:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     390:390:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):359 -> a
     385:385:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):361:361 -> a
-    386:386:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    386:386:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     386:386:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):362 -> a
     391:391:void accept(com.android.tools.r8.graph.DexDebugEventVisitor):368:368 -> a
     1:1:com.android.tools.r8.graph.DexString lambda$spec$1(com.android.tools.r8.graph.DexDebugEvent$StartLocal):313:313 -> b
@@ -28267,134 +28403,136 @@
     void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal) -> a
 com.android.tools.r8.graph.DexDebugInfo -> com.android.tools.r8.graph.a0:
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():26:26 -> <clinit>
-    1:1:void <init>():26:26 -> <init>
-    1:1:com.android.tools.r8.utils.structural.StructuralItem self():26:26 -> E
+    1:1:void <clinit>():27:27 -> <clinit>
+    1:1:void <init>():27:27 -> <init>
+    1:1:com.android.tools.r8.utils.structural.StructuralItem self():27:27 -> E
     int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor) -> a
-    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):26:26 -> a
-    2:6:int acceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):74:78 -> a
-    2:6:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):26 -> a
-    7:31:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo convertToEventBased(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexItemFactory):289:313 -> a
-    32:39:com.android.tools.r8.graph.DexDebugInfoForWriting convertToWritable(com.android.tools.r8.graph.DexDebugInfo):320:327 -> a
-    1:1:boolean computeEquals(java.lang.Object):83:83 -> h
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():66:66 -> m
+    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):27:27 -> a
+    2:6:int acceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):75:79 -> a
+    2:6:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):27 -> a
+    7:16:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo convertToEventBased(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexItemFactory):294:303 -> a
+    17:32:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo convertToEventBased(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexItemFactory):302:317 -> a
+    33:40:com.android.tools.r8.graph.DexDebugInfoForWriting convertToWritable(com.android.tools.r8.graph.DexDebugInfo):324:331 -> a
+    1:1:boolean computeEquals(java.lang.Object):84:84 -> h
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():67:67 -> m
     com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo asEventBasedInfo() -> m0
     com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo asPcBasedInfo() -> n0
     com.android.tools.r8.graph.DexDebugInfo$DebugInfoKind getKind() -> o0
     int getParameterCount() -> p0
     int getStartLine() -> q0
-    1:1:boolean isEventBasedInfo():43:43 -> r0
-    1:1:boolean isPcBasedInfo():47:47 -> s0
+    1:1:boolean isEventBasedInfo():44:44 -> r0
+    1:1:boolean isPcBasedInfo():48:48 -> s0
     com.android.tools.r8.graph.DexDebugInfo self() -> t0
 com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo -> com.android.tools.r8.graph.a0$a:
     com.android.tools.r8.graph.DexString[] parameters -> f
     com.android.tools.r8.graph.DexDebugEvent[] events -> g
     int startLine -> e
     boolean $assertionsDisabled -> h
-    1:1:void <clinit>():190:190 -> <clinit>
-    1:5:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):202:206 -> <init>
+    1:1:void <clinit>():195:195 -> <clinit>
+    1:5:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):207:211 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
-    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):190:190 -> a
-    2:6:int com.android.tools.r8.graph.DexDebugInfo.acceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):74:78 -> a
-    2:6:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):190 -> a
-    7:7:int lambda$specify$0(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):197:197 -> a
-    8:10:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):197:199 -> a
-    11:15:java.util.List computeEntries(com.android.tools.r8.graph.DexMethod):235:239 -> a
-    16:16:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):249:249 -> a
-    17:18:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):254:255 -> a
-    19:19:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):272:272 -> a
-    1:1:com.android.tools.r8.graph.DexString[] lambda$specify$1(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):198:198 -> b
-    1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$specify$2(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):199:199 -> c
-    1:1:int computeHashCode():244:244 -> l0
+    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):195:195 -> a
+    2:6:int com.android.tools.r8.graph.DexDebugInfo.acceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):75:79 -> a
+    2:6:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):195 -> a
+    7:7:int lambda$specify$0(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):202:202 -> a
+    8:10:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):202:204 -> a
+    11:15:java.util.List computeEntries(com.android.tools.r8.graph.DexMethod):240:244 -> a
+    16:16:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):254:254 -> a
+    17:18:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):259:260 -> a
+    19:19:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):277:277 -> a
+    1:1:com.android.tools.r8.graph.DexString[] lambda$specify$1(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):203:203 -> b
+    1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$specify$2(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):204:204 -> c
+    1:1:int computeHashCode():249:249 -> l0
     com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo asEventBasedInfo() -> m0
     com.android.tools.r8.graph.DexDebugInfo$DebugInfoKind getKind() -> o0
-    1:1:int getParameterCount():231:231 -> p0
-    1:1:int getStartLine():226:226 -> q0
+    1:1:int getParameterCount():236:236 -> p0
+    1:1:int getStartLine():231:231 -> q0
     com.android.tools.r8.graph.DexDebugInfo self() -> t0
-    1:1:java.lang.String toString():277:277 -> toString
+    1:1:java.lang.String toString():282:282 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":287,"2":288,"3":289}}
-    287:287:java.lang.String toString():278:278 -> toString
-    288:288:java.lang.String toString():278:278 -> toString
-    289:289:java.lang.String toString():278:278 -> toString
-    280:286:java.lang.String toString():278:284 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":292,"2":293,"3":294}}
+    292:292:java.lang.String toString():283:283 -> toString
+    293:293:java.lang.String toString():283:283 -> toString
+    294:294:java.lang.String toString():283:283 -> toString
+    285:291:java.lang.String toString():283:289 -> toString
 com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo -> com.android.tools.r8.graph.b0:
     int $r8$clinit -> h
     int maxPc -> f
     boolean $assertionsDisabled -> g
     int parameterCount -> e
-    1:1:void <clinit>():86:86 -> <clinit>
-    1:3:void <init>(int,int):95:97 -> <init>
+    1:1:void <clinit>():87:87 -> <clinit>
+    1:3:void <init>(int,int):96:98 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
     void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection) -> a
-    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):86:86 -> a
-    2:6:int com.android.tools.r8.graph.DexDebugInfo.acceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):74:78 -> a
-    2:6:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):86 -> a
-    7:7:int access$000(com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo):86:86 -> a
-    8:8:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):92:92 -> a
-    9:9:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):132:132 -> a
-    10:11:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):137:138 -> a
-    12:12:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):143:143 -> a
-    13:18:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):168:173 -> a
+    1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):87:87 -> a
+    2:6:int com.android.tools.r8.graph.DexDebugInfo.acceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):75:79 -> a
+    2:6:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):87 -> a
+    7:7:int access$000(com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo):87:87 -> a
+    8:8:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):93:93 -> a
+    9:9:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):137:137 -> a
+    10:11:int internalAcceptCompareTo(com.android.tools.r8.graph.DexDebugInfo,com.android.tools.r8.utils.structural.CompareToVisitor):142:143 -> a
+    12:12:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):148:148 -> a
+    13:18:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):173:178 -> a
     19:19:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):77:77 -> a
-    19:19:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):173 -> a
+    19:19:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):178 -> a
     20:21:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):77:78 -> a
-    20:21:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):173 -> a
+    20:21:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):178 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    22:23:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):174:175 -> a
+    22:23:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):179:180 -> a
     24:24:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):77:77 -> a
-    24:24:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):175 -> a
+    24:24:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):180 -> a
     25:26:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):77:78 -> a
-    25:26:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):175 -> a
+    25:26:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):180 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    27:27:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):177:177 -> a
-    1:1:int lambda$specify$0(com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo):92:92 -> b
-    1:1:int lambda$specify$1(com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo):92:92 -> c
-    1:1:int estimatedWriteSize():162:162 -> i0
-    2:4:int estimatedWriteSize(int,int):152:154 -> i0
-    2:4:int estimatedWriteSize():162 -> i0
-    1:1:int computeHashCode():127:127 -> l0
+    27:27:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):182:182 -> a
+    1:1:int lambda$specify$0(com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo):93:93 -> b
+    1:1:int lambda$specify$1(com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo):93:93 -> c
+    1:1:int estimatedWriteSize():167:167 -> i0
+    2:4:int estimatedWriteSize(int,int):157:159 -> i0
+    2:4:int estimatedWriteSize():167 -> i0
+    1:1:int computeHashCode():132:132 -> l0
     com.android.tools.r8.graph.DexDebugInfo$PcBasedDebugInfo asPcBasedInfo() -> n0
     com.android.tools.r8.graph.DexDebugInfo$DebugInfoKind getKind() -> o0
-    1:1:int getParameterCount():107:107 -> p0
+    1:1:int getParameterCount():112:112 -> p0
     int getStartLine() -> q0
     com.android.tools.r8.graph.DexDebugInfo self() -> t0
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":187,"2":188,"3":189}}
-    187:187:java.lang.String toString():182:182 -> toString
-    188:188:java.lang.String toString():182:182 -> toString
-    189:189:java.lang.String toString():182:182 -> toString
-    183:186:java.lang.String toString():182:185 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":192,"2":193,"3":194}}
+    192:192:java.lang.String toString():187:187 -> toString
+    193:193:java.lang.String toString():187:187 -> toString
+    194:194:java.lang.String toString():187:187 -> toString
+    188:191:java.lang.String toString():187:190 -> toString
+    1:1:int getMaxPc():102:102 -> u0
 com.android.tools.r8.graph.DexDebugInfo$WritableEventBasedDebugInfo -> com.android.tools.r8.graph.c0:
-    1:1:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[],com.android.tools.r8.graph.DexDebugInfo$1):331:331 -> <init>
-    2:2:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):336:336 -> <init>
-    1:1:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):259:259 -> a
-    1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):341 -> a
-    2:2:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    2:2:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):261 -> a
-    2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):341 -> a
-    3:4:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):264:265 -> a
-    3:4:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):341 -> a
-    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):346:346 -> a
-    6:11:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):362:367 -> a
+    1:1:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[],com.android.tools.r8.graph.DexDebugInfo$1):335:335 -> <init>
+    2:2:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):340:340 -> <init>
+    1:1:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):264:264 -> a
+    1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):345 -> a
+    2:2:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
+    2:2:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):266 -> a
+    2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):345 -> a
+    3:4:void com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):269:270 -> a
+    3:4:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):345 -> a
+    5:5:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):350:350 -> a
+    6:11:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):366:371 -> a
     12:12:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):77:77 -> a
-    12:12:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):368 -> a
+    12:12:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):372 -> a
     13:13:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):77:77 -> a
-    13:13:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):368 -> a
+    13:13:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):372 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):77:77 -> a
-    14:14:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):368 -> a
+    14:14:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):372 -> a
     15:15:void com.android.tools.r8.graph.DexDebugEvent.writeOn(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):78:78 -> a
-    15:15:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):368 -> a
+    15:15:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):372 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16:16:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):370:370 -> a
-    1:2:int estimatedWriteSize():351:352 -> i0
+    16:16:void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens):374:374 -> a
+    1:2:int estimatedWriteSize():355:356 -> i0
 com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod -> com.android.tools.r8.graph.d0:
     com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod INSTANCE -> i
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.graph.DexString[],com.android.tools.r8.graph.DexDebugEvent[]):16:16 -> <init>
     1:1:com.android.tools.r8.graph.DexDebugInfoForSingleLineMethod getInstance():20:20 -> u0
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.Yg:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.ch:
     void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection) -> a
     void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection) -> a
     void write(com.android.tools.r8.dex.DebugBytecodeWriter,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.GraphLens) -> a
@@ -28485,10 +28623,10 @@
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):46:46 -> a
     3:3:com.android.tools.r8.graph.DexProgramClass programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):59:59 -> a
     4:4:com.android.tools.r8.graph.DexClassAndMethod definitionFor(com.android.tools.r8.graph.DexMethod):91:91 -> a
-    5:5:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):601:601 -> a
+    5:5:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):615:615 -> a
     5:5:com.android.tools.r8.graph.DexClassAndMethod definitionFor(com.android.tools.r8.graph.DexMethod):92 -> a
-    6:6:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):605:605 -> a
-    6:6:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):601 -> a
+    6:6:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> a
+    6:6:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):615 -> a
     6:6:com.android.tools.r8.graph.DexClassAndMethod definitionFor(com.android.tools.r8.graph.DexMethod):92 -> a
     7:7:com.android.tools.r8.graph.DexClass definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):42:42 -> b
@@ -28519,7 +28657,7 @@
     57:57:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):45 -> a
     58:58:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     58:58:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):45 -> a
-    59:59:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    59:59:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     59:59:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     59:59:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):45 -> a
     51:51:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):46:46 -> a
@@ -28528,7 +28666,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     53:53:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):64:64 -> a
     53:53:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):47 -> a
-    54:54:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    54:54:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     54:54:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):64 -> a
     54:54:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):47 -> a
     55:55:void com.android.tools.r8.graph.DexAnnotationElement.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):65:65 -> a
@@ -28610,30 +28748,20 @@
     13:14:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):147 -> a
     15:15:java.lang.Object apply(java.util.function.Function,java.util.function.Function):191:191 -> a
     16:18:void setStaticValue(com.android.tools.r8.graph.DexValue):247:249 -> a
-    19: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):269:273 -> a
-    24:24:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():107:107 -> a
-    24:24: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
-    25:35: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
-    36:36:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    36:36: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 -> a
-    37: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):293:299 -> a
-    44:44:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> 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):299 -> 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):300:300 -> a
-    46:46:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):313:313 -> a
-    47:47:com.android.tools.r8.graph.DexEncodedField$Builder builder(com.android.tools.r8.graph.DexEncodedField):359:359 -> a
-    47:47:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):316 -> a
-    48:50:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):317:319 -> a
-    51:54:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):318:321 -> a
-    55:56:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):345:346 -> a
-    57:57:boolean getIsInlinableByJavaC():371:371 -> a
-    57:57:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):375 -> a
-    58:58:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):378:378 -> a
-    59:59:boolean isFinal():208:208 -> a
-    59:59:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):378 -> a
-    60:69:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):381:390 -> a
-    70:70:void markAsInlinableByJavaC():367:367 -> a
-    70:70:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):393 -> a
+    19:19:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):313:313 -> a
+    20:20:com.android.tools.r8.graph.DexEncodedField$Builder builder(com.android.tools.r8.graph.DexEncodedField):359:359 -> a
+    20:20:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):316 -> a
+    21:23:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):317:319 -> a
+    24:27:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,java.util.function.Consumer):318:321 -> a
+    28:29:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):345:346 -> a
+    30:30:boolean getIsInlinableByJavaC():371:371 -> a
+    30:30:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):375 -> a
+    31:31:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):378:378 -> a
+    32:32:boolean isFinal():208:208 -> a
+    32:32:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):378 -> a
+    33:42:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):381:390 -> a
+    43:43:void markAsInlinableByJavaC():367:367 -> a
+    43:43:boolean getOrComputeIsInlinableByJavaC(com.android.tools.r8.graph.DexItemFactory):393 -> a
     1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo access$300(com.android.tools.r8.graph.DexEncodedField):32:32 -> b
     2:6:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):325:329 -> b
     7:7:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):0:0 -> b
@@ -28708,7 +28836,7 @@
     3:3:com.android.tools.r8.graph.DexEncodedField$Builder setAnnotations(com.android.tools.r8.graph.DexAnnotationSet):458:458 -> b
     3:3:com.android.tools.r8.graph.DexEncodedField$Builder clearAnnotations():454 -> b
     4:4:com.android.tools.r8.graph.DexEncodedField$Builder setDeprecated(boolean):493:493 -> b
-com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.Zg:
+com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.dh:
     com.android.tools.r8.androidapi.ComputedApiLevel apiLevelForDefinition -> e
     boolean d8R8Synthesized -> d
     com.android.tools.r8.graph.DexMember reference -> f
@@ -28843,13 +28971,13 @@
     775:777:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):394:396 -> a
     775:777:com.android.tools.r8.graph.ProgramMethod asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):413 -> a
     778:779:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):460:461 -> a
-    780:780:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    780:780:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     780:780:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):461 -> a
     781:782:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):462:463 -> a
-    783:783:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    783:783:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     783:783:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):915 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    784:784:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    784:784:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     784:784:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):915 -> a
     785:798:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):921:934 -> a
     785:798:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):916 -> a
@@ -28915,7 +29043,7 @@
     4124:4127:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):880:883 -> a
     4131:4140:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.dex.code.DexInstruction[]):896:905 -> a
     4141:4144:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):963:966 -> a
-    4145:4145:int com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.getParameterCount():231:231 -> a
+    4145:4145:int com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo.getParameterCount():236:236 -> a
     4145:4145:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):966 -> a
     4146:4151:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):966:971 -> a
     4152:4153:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1056:1057 -> a
@@ -28963,10 +29091,10 @@
     4332:4332:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1282:1282 -> a
     4332:4332:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):950 -> a
     4333:4333:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):952:952 -> a
-    4334:4334:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    4334:4334:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     4334:4334:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):952 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4335:4335:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    4335:4335:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     4335:4335:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):952 -> a
     4336:4336:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):953:953 -> a
     4337:4338:com.android.tools.r8.graph.CfCode toCfCodeThatLogsError(com.android.tools.r8.graph.DexItemFactory):1008:1009 -> a
@@ -29186,7 +29314,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder disableMethodNotNullCheck():1546:1546 -> d
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder disableParameterAnnotationListCheck():1551:1551 -> e
     1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder unsetIsLibraryMethodOverride():1414:1414 -> f
-com.android.tools.r8.graph.DexEncodedMethod$CompilationState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.ah:
+com.android.tools.r8.graph.DexEncodedMethod$CompilationState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.eh:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -29230,7 +29358,7 @@
     329:329:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):148 -> a
     330:330:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     330:330:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):148 -> a
-    331:331:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    331:331:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     331:331:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     331:331:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):148 -> a
     174:174:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):149:149 -> a
@@ -29244,19 +29372,19 @@
     333:333:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):149 -> a
     334:334:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     334:334:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):149 -> a
-    335:335:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    335:335:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     335:335:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     335:335:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):149 -> a
     326:326:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):150:150 -> a
-    327:327:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    327:327:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     327:327:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):150 -> a
     336:336:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):156:156 -> a
     337:337:com.android.tools.r8.graph.DexField withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):205:205 -> a
-    338:338:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):557:557 -> a
+    338:338:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):571:571 -> a
     338:338:com.android.tools.r8.graph.DexClassAndField lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
     338:338:com.android.tools.r8.graph.DexClassAndMember lookupMemberOnClass(com.android.tools.r8.graph.DexClass):22 -> a
-    339:339:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):561:561 -> a
-    339:339:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):557 -> a
+    339:339:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):575:575 -> a
+    339:339:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):571 -> a
     339:339:com.android.tools.r8.graph.DexClassAndField lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
     339:339:com.android.tools.r8.graph.DexClassAndMember lookupMemberOnClass(com.android.tools.r8.graph.DexClass):22 -> a
     1:1:com.android.tools.r8.graph.DexEncodedField lookupOnClass(com.android.tools.r8.graph.DexClass):79:79 -> b
@@ -29301,35 +29429,32 @@
     1:1:java.lang.String toSourceString():48:48 -> k0
 com.android.tools.r8.graph.DexItemFactory -> com.android.tools.r8.graph.t0:
     com.android.tools.r8.graph.DexString invokeExactMethodName -> A0
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> M4
     com.android.tools.r8.graph.DexString endsWithMethodName -> Q
     com.android.tools.r8.graph.DexString javacLambdaMethodPrefix -> b1
     com.android.tools.r8.graph.DexType runnableType -> F2
     com.android.tools.r8.graph.DexType javaUtilListType -> g3
-    com.android.tools.r8.graph.DexType externalizableType -> G4
+    com.android.tools.r8.graph.DexType enumerationType -> G4
     com.android.tools.r8.graph.DexString classArrayDescriptor -> I0
-    java.util.Set libraryMethodsReturningNonNull -> W4
     com.android.tools.r8.graph.DexString getTypeNameName -> r0
     com.android.tools.r8.graph.DexString intDescriptor -> A
     java.util.Map types -> c
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> x4
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> x4
     com.android.tools.r8.graph.DexType iterableType -> V1
     com.android.tools.r8.graph.DexType setType -> w2
     com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> B3
     com.android.tools.r8.graph.DexString invokeMethodName -> z0
     com.android.tools.r8.graph.DexItemFactory$EnumMembers enumMembers -> O3
-    com.android.tools.r8.graph.DexType annotationSignature -> p4
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> p4
     com.android.tools.r8.graph.DexType recordType -> N1
     com.android.tools.r8.graph.DexType varHandleType -> o2
     com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> W3
     com.android.tools.r8.graph.DexType boxedLongType -> F1
     com.android.tools.r8.graph.DexString cloneMethodName -> a0
     com.android.tools.r8.graph.DexString equalsMethodName -> R
-    com.android.tools.r8.graph.DexType serializedLambdaType -> h4
+    java.util.List libraryMembersCollection -> e4
     com.android.tools.r8.graph.DexType closeableType -> g2
     com.android.tools.r8.graph.DexString getClassMethodName -> i0
     com.android.tools.r8.kotlin.Kotlin kotlin -> Y3
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> R4
     com.android.tools.r8.graph.DexType intArrayType -> w1
     com.android.tools.r8.graph.DexString npeDescriptor -> Q0
     com.android.tools.r8.graph.DexString longDescriptor -> B
@@ -29344,41 +29469,38 @@
     com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> f3
     com.android.tools.r8.graph.DexType consumerType -> E2
     com.android.tools.r8.graph.DexString classLoaderDescriptor -> H0
-    com.android.tools.r8.graph.DexType serializableType -> F4
-    java.util.Set libraryMethodsReturningReceiver -> V4
+    com.android.tools.r8.graph.DexType listIteratorType -> F4
     com.android.tools.r8.graph.DexString throwableDescriptor -> P0
     com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> V3
     com.android.tools.r8.graph.DexString getSimpleNameName -> q0
+    com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers stringConcatFactoryMembers -> P4
     com.android.tools.r8.graph.DexType collectionsType -> U1
     com.android.tools.r8.graph.DexType listType -> v2
     com.android.tools.r8.graph.DexString shortDescriptor -> C
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> w4
+    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> w4
     com.android.tools.r8.graph.DexString assertionsDisabled -> y0
     com.android.tools.r8.graph.DexType objectType -> M1
     com.android.tools.r8.graph.DexType javaIoPrintStreamType -> n2
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> R4
     java.util.Map protos -> e
-    com.android.tools.r8.graph.DexString unknownTypeName -> c5
     com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> a4
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> o4
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> o4
     com.android.tools.r8.graph.DexString lambdaInstanceFieldName -> a1
     com.android.tools.r8.graph.DexType boxedIntType -> E1
     com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> D3
     com.android.tools.r8.graph.DexType autoCloseableType -> f2
     com.android.tools.r8.graph.DexString identityHashCodeName -> T
-    boolean $assertionsDisabled -> e5
     com.android.tools.r8.graph.DexString wrapperFieldName -> h0
-    java.util.IdentityHashMap internalSentinels -> d5
     com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> w3
     com.android.tools.r8.graph.DexString getCanonicalNameName -> p0
+    com.android.tools.r8.synthesis.SyntheticNaming syntheticNaming -> Q4
     com.android.tools.r8.graph.DexType icceType -> V2
     com.android.tools.r8.graph.DexType floatArrayType -> v1
     com.android.tools.r8.graph.DexString voidDescriptor -> D
-    java.util.Map unboxPrimitiveMethod -> Q4
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advanceLines -> h
     com.android.tools.r8.graph.DexString temporaryConstructorMethodPrefix -> X0
     com.android.tools.r8.graph.DexType doubleConsumer -> N2
     com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> o3
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> c4
     com.android.tools.r8.graph.DexType intType -> n1
     java.util.Map methods -> f
     com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMembers javaLangSystemMembers -> S3
@@ -29386,30 +29508,32 @@
     com.android.tools.r8.graph.DexString throwableArrayDescriptor -> d1
     com.android.tools.r8.graph.DexItemFactory$RecordMembers recordMembers -> G3
     com.android.tools.r8.graph.DexType javaUtilComparatorType -> e3
-    com.android.tools.r8.graph.DexType enumerationType -> E4
+    com.android.tools.r8.graph.DexType iteratorType -> E4
     java.util.Map setFiles -> o
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> u
     com.android.tools.r8.graph.DexType predicateType -> D2
     com.android.tools.r8.graph.DexString fieldDescriptor -> K0
-    java.util.Set libraryTypesAssumedToBePresent -> Y4
+    java.util.Set libraryMethodsReturningNonNull -> Y4
     com.android.tools.r8.graph.DexString getFieldName -> t0
     java.util.List typeSpecificBuffers -> M2
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> v4
+    com.android.tools.r8.graph.DexType annotationThrows -> v4
     com.android.tools.r8.graph.DexType objectsType -> T1
     com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> u2
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> n4
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> j4
+    com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers objectMethodsMembers -> N4
+    com.android.tools.r8.graph.DexType annotationInnerClass -> n4
     com.android.tools.r8.graph.DexString lengthMethodName -> M
     com.android.tools.r8.graph.DexType stringArrayType -> L1
     com.android.tools.r8.graph.DexType javaLangSystemType -> m2
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> e4
     com.android.tools.r8.graph.DexString trimName -> c0
+    java.util.Set libraryTypesAssumedToBePresent -> a5
     java.util.concurrent.ConcurrentHashMap classTypeInterfaces -> t
     com.android.tools.r8.graph.DexType methodType -> e2
     com.android.tools.r8.graph.DexType boxedFloatType -> D1
     java.util.Map setInlineFrames -> p
     com.android.tools.r8.graph.DexString ordinalMethodName -> k0
     com.android.tools.r8.graph.DexDebugEvent$Default zeroChangeDefaultEvent -> q
-    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> T4
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> T4
     com.android.tools.r8.graph.DexType doubleArrayType -> u1
     com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> S0
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> m
@@ -29423,62 +29547,63 @@
     com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> M3
     com.android.tools.r8.graph.DexType supplierType -> C2
     java.util.concurrent.ConcurrentHashMap referenceTypes -> s
-    com.android.tools.r8.graph.DexType listIteratorType -> D4
+    com.android.tools.r8.graph.DexType typeDescriptorType -> D4
     com.android.tools.r8.graph.DexType javaUtilCollectionsType -> d3
     com.android.tools.r8.graph.DexString constructorDescriptor -> J0
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> i4
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> X4
+    java.util.Set libraryMethodsReturningReceiver -> X4
     com.android.tools.r8.graph.DexString getDeclaredConstructorName -> s0
-    com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers stringConcatFactoryMembers -> N4
     com.android.tools.r8.graph.DexType annotationType -> S1
     com.android.tools.r8.graph.DexType serviceLoaderType -> t2
     com.android.tools.r8.graph.DexItemFactory$AndroidUtilLogMembers androidUtilLogMembers -> P3
-    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> u4
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> P4
+    java.util.IdentityHashMap internalSentinels -> f5
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> u4
     com.android.tools.r8.graph.DexType stringType -> K1
     com.android.tools.r8.graph.DexType javaLangReflectArrayType -> l2
+    com.android.tools.r8.graph.DexString unknownTypeName -> e5
     com.android.tools.r8.graph.DexString containsMethodName -> O
-    com.android.tools.r8.graph.DexType annotationInnerClass -> m4
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> m4
     com.android.tools.r8.graph.DexString startsWithMethodName -> P
     com.android.tools.r8.graph.DexString substringName -> b0
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> n
     com.android.tools.r8.graph.DexType fieldType -> d2
+    boolean $assertionsDisabled -> g5
     com.android.tools.r8.graph.DexType boxedDoubleType -> C1
     com.android.tools.r8.graph.DexString finalizeMethodName -> j0
     com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> I3
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> S4
     com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> R0
     java.util.Map strings -> b
     com.android.tools.r8.graph.DexType illegalAccessErrorType -> T2
+    com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers androidOsBuildVersionMembers -> b4
     com.android.tools.r8.graph.DexType charArrayType -> t1
     com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> v3
+    java.util.Map unboxPrimitiveMethod -> S4
     com.android.tools.r8.graph.DexString thisName -> Z0
     com.android.tools.r8.graph.DexType bufferType -> L2
     com.android.tools.r8.graph.DexType androidOsBuildVersionType -> m3
     com.android.tools.r8.graph.DexItemFactory$ShortMembers shortMembers -> H3
     com.android.tools.r8.graph.DexType doubleType -> l1
     com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> Z3
-    com.android.tools.r8.graph.DexType unsafeType -> K4
+    com.android.tools.r8.graph.DexType unsafeType -> M4
+    com.android.tools.r8.graph.DexType comparableType -> K4
     com.android.tools.r8.graph.DexString objectDescriptor -> E0
     com.android.tools.r8.graph.DexString kindString -> f1
     com.android.tools.r8.graph.DexType comparatorType -> B2
     com.android.tools.r8.graph.DexType javaNioByteOrderType -> c3
     com.android.tools.r8.graph.DexString compareToMethodName -> Y
+    com.android.tools.r8.graph.DexType nullValueType -> d5
     com.android.tools.r8.graph.DexString floatDescriptor -> z
-    com.android.tools.r8.graph.DexType iteratorType -> C4
+    com.android.tools.r8.graph.DexType objectMethodsType -> C4
     com.android.tools.r8.graph.DexString enumDescriptor -> M0
     com.android.tools.r8.graph.DexType classType -> Z1
     com.android.tools.r8.graph.DexItemFactory$JavaIoPrintStreamMembers javaIoPrintStreamMembers -> T3
     com.android.tools.r8.graph.DexString getMethodName -> v0
-    com.android.tools.r8.graph.DexType annotationThrows -> t4
+    com.android.tools.r8.graph.DexType annotationPermittedSubclasses -> t4
     com.android.tools.r8.graph.DexType enumType -> R1
     com.android.tools.r8.graph.DexType proxyType -> s2
-    com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers objectMethodsMembers -> L4
     com.android.tools.r8.graph.DexString waitMethodName -> I
     com.android.tools.r8.graph.DexType charSequenceArrayType -> J1
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> l4
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> l4
     com.android.tools.r8.graph.DexType javaLangAnnotationRetentionPolicyType -> k2
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> g4
     com.android.tools.r8.graph.DexType boxedCharType -> B1
     com.android.tools.r8.graph.DexString toStringMethodName -> e0
     com.android.tools.r8.graph.DexType constructorType -> c2
@@ -29487,6 +29612,7 @@
     com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> m0
     com.android.tools.r8.graph.DexItemFactory$BufferMembers bufferMembers -> F3
     com.android.tools.r8.graph.DexItemFactory$DoubleMembers doubleMembers -> J3
+    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> V4
     com.android.tools.r8.graph.DexType byteArrayType -> s1
     com.android.tools.r8.graph.DexString newUpdaterName -> U0
     com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> X3
@@ -29494,37 +29620,40 @@
     com.android.tools.r8.graph.DexType androidUtilSparseArrayType -> t3
     com.android.tools.r8.graph.DexString notifyMethodName -> J
     com.android.tools.r8.graph.DexType charType -> k1
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> L4
     com.android.tools.r8.graph.DexType streamType -> K2
     com.android.tools.r8.graph.DexType androidOsBuildType -> l3
     com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> j3
     com.android.tools.r8.graph.DexString valueString -> e1
     com.android.tools.r8.graph.DexType optionalIntType -> I2
     com.android.tools.r8.graph.DexString stringDescriptor -> D0
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> J4
-    java.util.Set libraryClassesWithoutStaticInitialization -> Z4
+    com.android.tools.r8.graph.DexType cloneableType -> J4
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> Z4
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> g4
     com.android.tools.r8.graph.DexType javaMathBigIntegerType -> b3
     com.android.tools.r8.graph.DexString methodDescriptor -> L0
     com.android.tools.r8.graph.DexType collectionType -> A2
-    com.android.tools.r8.graph.DexType typeDescriptorType -> B4
+    com.android.tools.r8.graph.DexType lookupType -> B4
     com.android.tools.r8.graph.DexDebugEvent$Default oneChangeDefaultEvent -> r
     com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> Y1
     com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> z2
     com.android.tools.r8.graph.DexString getDeclaredFieldName -> u0
     com.android.tools.r8.graph.DexType classArrayType -> Q1
     com.android.tools.r8.graph.DexType invocationHandlerType -> r2
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> s4
+    com.android.tools.r8.graph.DexType annotationNestMembers -> s4
     com.android.tools.r8.graph.DexString notifyAllMethodName -> K
     com.android.tools.r8.graph.DexType charSequenceType -> I1
     com.android.tools.r8.graph.DexType stringBufferType -> j2
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> k4
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> f4
+    com.android.tools.r8.graph.DexType annotationDefault -> k4
     com.android.tools.r8.graph.DexString valueOfMethodName -> d0
+    java.util.Set libraryClassesWithoutStaticInitialization -> b5
     com.android.tools.r8.graph.DexType boxedByteType -> A1
     com.android.tools.r8.graph.DexType classLoaderType -> b2
-    boolean skipNameValidationForTesting -> a5
     com.android.tools.r8.graph.DexString nameMethodName -> l0
     com.android.tools.r8.graph.DexType kotlinMetadataType -> Z2
     com.android.tools.r8.graph.DexType boxedBooleanType -> z1
-    java.util.Map libraryMethodsNonNullParamOrThrow -> U4
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> U4
     com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> T0
     com.android.tools.r8.graph.DexType runtimeExceptionType -> R2
     com.android.tools.r8.graph.DexType androidViewViewType -> s3
@@ -29534,29 +29663,27 @@
     com.android.tools.r8.graph.DexType javaUtilSetType -> k3
     com.android.tools.r8.graph.DexType byteType -> j1
     com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> i3
-    com.android.tools.r8.graph.DexType comparableType -> I4
+    com.android.tools.r8.graph.DexType externalizableType -> I4
     com.android.tools.r8.graph.DexType optionalDoubleType -> H2
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> U
     com.android.tools.r8.graph.DexString booleanDescriptor -> v
     com.android.tools.r8.graph.DexString classDescriptor -> G0
     com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> E3
+    com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers androidUtilSparseArrayMembers -> c4
     com.android.tools.r8.graph.DexString dalvikAnnotationOptimizationPrefix -> h1
     com.android.tools.r8.graph.DexType javaIoFileType -> a3
-    com.android.tools.r8.graph.DexType objectMethodsType -> A4
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> f4
-    com.android.tools.r8.graph.DexType nullValueType -> b5
+    com.android.tools.r8.graph.DexType callSiteType -> A4
     com.android.tools.r8.graph.DexString arraysDescriptor -> O0
-    com.android.tools.r8.graph.DexType lookupType -> z4
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> z4
     com.android.tools.r8.graph.DexType strictMathType -> X1
     com.android.tools.r8.graph.DexType mapEntryType -> y2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advancePCs -> i
     com.android.tools.r8.graph.DexString descriptorSeparator -> E
     com.android.tools.r8.graph.DexString newInstanceName -> x0
-    com.android.tools.r8.graph.DexType annotationNestMembers -> r4
+    com.android.tools.r8.graph.DexType annotationNestHost -> r4
     com.android.tools.r8.graph.DexType objectArrayType -> P1
     com.android.tools.r8.graph.DexType methodTypeType -> q2
     java.util.Map methodHandles -> g
-    com.android.tools.r8.graph.DexType annotationDefault -> j4
     com.android.tools.r8.graph.DexType stringBuilderType -> i2
     com.android.tools.r8.graph.DexType boxedNumberType -> H1
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> V
@@ -29575,42 +29702,45 @@
     com.android.tools.r8.graph.DexType retentionType -> Q2
     com.android.tools.r8.graph.DexType androidUtilPropertyType -> r3
     com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> L3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> d4
     com.android.tools.r8.graph.DexType booleanType -> i1
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> O4
     com.android.tools.r8.graph.DexType optionalType -> G2
     com.android.tools.r8.graph.DexItemFactory$CharMembers charMembers -> y3
-    com.android.tools.r8.graph.DexType cloneableType -> H4
+    com.android.tools.r8.graph.DexType serializableType -> H4
     com.android.tools.r8.graph.DexType javaUtilLocaleType -> h3
     com.android.tools.r8.graph.DexString versionHashString -> g1
     com.android.tools.r8.graph.DexString objectArrayDescriptor -> F0
     com.android.tools.r8.graph.DexString indexOfMethodName -> W
     com.android.tools.r8.graph.DexItemFactory$VoidMembers voidMembers -> C3
-    com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers androidUtilSparseArrayMembers -> b4
     com.android.tools.r8.graph.DexString charDescriptor -> x
     com.android.tools.r8.graph.DexString listDescriptor -> N0
     com.android.tools.r8.graph.DexType mathType -> W1
     com.android.tools.r8.graph.DexType mapType -> x2
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap endLocals -> k
-    com.android.tools.r8.graph.DexType callSiteType -> y4
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> y4
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> G
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> w0
     com.android.tools.r8.graph.DexType recordTagType -> O1
     com.android.tools.r8.graph.DexType methodHandleType -> p2
-    com.android.tools.r8.graph.DexType annotationNestHost -> q4
+    com.android.tools.r8.graph.DexType annotationSignature -> q4
     com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> U3
     com.android.tools.r8.graph.DexType zipFileType -> h2
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> h4
     com.android.tools.r8.graph.DexType boxedShortType -> G1
-    java.util.List libraryMembersCollection -> d4
+    com.android.tools.r8.graph.DexType serializedLambdaType -> i4
     com.android.tools.r8.graph.DexString internMethodName -> f0
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> X
     com.android.tools.r8.graph.DexString doubleDescriptor -> y
     java.util.Set possibleCompilerSynthesizedTypes -> a
+    boolean skipNameValidationForTesting -> c5
     com.android.tools.r8.graph.DexString forNameMethodName -> n0
     com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> A3
     com.android.tools.r8.graph.DexType noSuchMethodErrorType -> X2
     com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> K3
     com.android.tools.r8.graph.DexType longArrayType -> x1
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap restartLocals -> l
-    com.android.tools.r8.synthesis.SyntheticNaming syntheticNaming -> O4
+    java.util.Map libraryMethodsNonNullParamOrThrow -> W4
     com.android.tools.r8.graph.DexString constructorMethodName -> V0
     com.android.tools.r8.graph.DexItemFactory$JavaLangReflectArrayMembers javaLangReflectArrayMembers -> Q3
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> H
@@ -29619,8 +29749,8 @@
     com.android.tools.r8.graph.DexType shortType -> p1
     1:51:void <clinit>():70:120 -> <clinit>
     1:1:void <init>():124:124 -> <init>
-    2:628:void <init>():80:706 -> <init>
-    629:743:void <init>():696:810 -> <init>
+    2:630:void <init>():80:708 -> <init>
+    631:743:void <init>():698:810 -> <init>
     744:760:void <init>():800:816 -> <init>
     761:848:void <init>():813:900 -> <init>
     849:849:void <init>():125:125 -> <init>
@@ -29659,7 +29789,7 @@
     17:17:com.android.tools.r8.graph.DexDebugEvent$Default com.android.tools.r8.graph.DexDebugEvent$Default.create(int,int):638:638 -> a
     17:17:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int,int):2892 -> a
     18:18:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int,int):2892:2892 -> a
-    19:20:com.android.tools.r8.graph.DexMethod createUnboxMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):721:722 -> a
+    19:20:com.android.tools.r8.graph.DexMethod createUnboxMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):723:724 -> a
     21:32:java.util.Set boxedValueOfMethods():785:796 -> a
     33:35:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):788:790 -> a
     36:36:void setSkipNameValidationForTesting(boolean):903:903 -> a
@@ -29760,7 +29890,7 @@
     215:222: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):2966:2973 -> a
     223:254: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):2972:3003 -> a
     255:260:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(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):2980:2985 -> a
-    261:271:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AppView.isInterface(com.android.tools.r8.graph.DexType):346:356 -> a
+    261:271:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AppView.isInterface(com.android.tools.r8.graph.DexType):358:368 -> a
     261:271:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(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):2986 -> a
     272:277:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(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):2986:2991 -> a
     278:292:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$9(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):2987:3001 -> a
@@ -29772,7 +29902,7 @@
     2:2: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):343:343 -> 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):2543 -> b
     3:3:java.util.Optional lambda$createInstanceInitializerWithFreshProto$5(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):2543:2543 -> b
-    4:5:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):747:748 -> b
+    4:5:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):749:750 -> b
     6:7:java.util.Map buildLibraryMethodsNonNullParamOrThrow():825:826 -> b
     8:8:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1612:1612 -> b
     8:8:java.util.Map buildLibraryMethodsNonNullParamOrThrow():826 -> b
@@ -29817,30 +29947,30 @@
     43:45:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2736:2738 -> b
     46:48:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2880:2882 -> b
     49:50:com.android.tools.r8.ir.analysis.type.InterfaceCollection lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$10(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):3011:3012 -> b
-    1:24:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):752:775 -> c
-    25:25:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":827,"2":828,"3":829,"4":830,"5":831}}
+    1:22:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):754:775 -> c
+    23:23:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":825,"2":826,"3":827,"4":828,"5":829}}
+    825:825:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):775:775 -> c
+    826:826:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):775:775 -> c
     827:827:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):775:775 -> c
     828:828:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):775:775 -> c
     829:829:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):775:775 -> c
-    830:830:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):775:775 -> c
-    831:831:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):775:775 -> c
-    800:800:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):775:775 -> c
-    801:801:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):773:773 -> c
-    802:802:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):771:771 -> c
-    803:803:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):769:769 -> c
-    804:804:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):767:767 -> c
-    805:805:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):765:765 -> c
-    806:806:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):763:763 -> c
-    807:807:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):761:761 -> c
-    808:808:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):759:759 -> c
-    809:809:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):757:757 -> c
-    832:832:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2630:2630 -> c
-    833:837:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2642:2646 -> c
-    833:837:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2631 -> c
-    838:838:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):2660:2660 -> c
-    839:841:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2886:2888 -> c
-    842:844:void clearTypeElementsCache():2937:2939 -> c
+    798:798:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):775:775 -> c
+    799:799:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):773:773 -> c
+    800:800:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):771:771 -> c
+    801:801:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):769:769 -> c
+    802:802:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):767:767 -> c
+    803:803:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):765:765 -> c
+    804:804:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):763:763 -> c
+    805:805:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):761:761 -> c
+    806:806:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):759:759 -> c
+    807:807:com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers getBoxedMembersForPrimitiveOrVoidType(com.android.tools.r8.graph.DexType):757:757 -> c
+    830:830:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2630:2630 -> c
+    831:835:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2642:2646 -> c
+    831:835:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):2631 -> c
+    836:836:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):2660:2660 -> c
+    837:839:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2886:2888 -> c
+    840:842:void clearTypeElementsCache():2937:2939 -> c
     1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2594:2602 -> d
     10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):2599:2599 -> d
     11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):129:129 -> d
@@ -29858,9 +29988,9 @@
     11:11:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2912:2912 -> e
     1:5:java.util.List extractMarkers():2582:2586 -> f
     1:1:boolean getSkipNameValidationForTesting():907:907 -> g
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming getSyntheticNaming():693:693 -> h
+    1:1:com.android.tools.r8.synthesis.SyntheticNaming getSyntheticNaming():695:695 -> h
     1:3:boolean verifyNoCachedTypeElements():2943:2945 -> i
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.internal.dh:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.internal.hh:
     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
@@ -29880,7 +30010,7 @@
     com.android.tools.r8.graph.DexField CPU_ABI -> c
     1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):924:946 -> <init>
     1:17:void forEachFinalField(java.util.function.Consumer):950:966 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.internal.eh:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.internal.ih:
     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
@@ -29888,12 +30018,12 @@
     com.android.tools.r8.graph.DexField SDK -> c
     1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):970:977 -> <init>
     1:5:void forEachFinalField(java.util.function.Consumer):981:985 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.internal.fh:
+com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.internal.jh:
     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):989:993 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):997:998 -> a
-com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.internal.gh:
+com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.internal.kh:
     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):1002:1005 -> <init>
@@ -29903,11 +30033,11 @@
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1711:1711 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1716:1716 -> <init>
     3:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1713:1714 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers -> com.android.tools.r8.internal.hh:
+com.android.tools.r8.graph.DexItemFactory$AndroidUtilSparseArrayMembers -> com.android.tools.r8.internal.lh:
     com.android.tools.r8.graph.DexMethod set -> b
     com.android.tools.r8.graph.DexMethod put -> a
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1037:1041 -> <init>
-com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.internal.ih:
+com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.internal.mh:
     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
@@ -29939,10 +30069,10 @@
     3:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1046:1057 -> <init>
     1:3:void forEachFinalField(java.util.function.Consumer):1063:1065 -> a
     4:4:com.android.tools.r8.graph.DexField getTypeField():1070:1070 -> a
-com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers -> com.android.tools.r8.internal.jh:
+com.android.tools.r8.graph.DexItemFactory$BoxedPrimitiveMembers -> com.android.tools.r8.internal.nh:
     1:1:void <init>():919:919 -> <init>
     com.android.tools.r8.graph.DexField getTypeField() -> a
-com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.internal.kh:
+com.android.tools.r8.graph.DexItemFactory$BufferMembers -> com.android.tools.r8.internal.oh:
     java.util.List bufferCovariantMethods -> a
     1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1543:1554 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ByteMembers -> com.android.tools.r8.graph.u0:
@@ -30031,17 +30161,17 @@
     3:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1110:1113 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1119:1119 -> a
     2:2:com.android.tools.r8.graph.DexField getTypeField():1124:1124 -> a
-com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.internal.lh:
+com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.internal.ph:
     com.android.tools.r8.graph.DexMethod initWithMessage -> a
     1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1843:1847 -> <init>
     6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1846:1846 -> <init>
-com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.internal.mh:
+com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.internal.qh:
     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):1319:1324 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1328:1328 -> a
     2:2:com.android.tools.r8.graph.DexField getTypeField():1333:1333 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.internal.nh:
+com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.internal.rh:
     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):1128:1131 -> <init>
@@ -30070,12 +30200,12 @@
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1751:1751 -> <init>
     3:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1741:1746 -> <init>
     9:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1744:1749 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.internal.oh:
+com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.internal.sh:
     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):1140:1144 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):1148:1149 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.internal.ph:
+com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.internal.th:
     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):1153:1158 -> <init>
@@ -30086,12 +30216,12 @@
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1167:1167 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1172:1176 -> <init>
     7:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1174:1180 -> <init>
-com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.internal.qh:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.internal.uh:
     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):1188:1193 -> <init>
     1:2:void forEachFinalField(java.util.function.Consumer):1197:1198 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.internal.rh:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.internal.vh:
     com.android.tools.r8.graph.DexField NANOSECONDS -> f
     com.android.tools.r8.graph.DexField MINUTES -> e
     com.android.tools.r8.graph.DexField SECONDS -> g
@@ -30101,13 +30231,13 @@
     com.android.tools.r8.graph.DexField MICROSECONDS -> c
     1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1202:1217 -> <init>
     1:7:void forEachFinalField(java.util.function.Consumer):1221:1227 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.internal.sh:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.internal.wh:
     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):1231:1235 -> <init>
     1:3:void forEachFinalField(java.util.function.Consumer):1239:1241 -> a
-com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.internal.th:
+com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.internal.xh:
     com.android.tools.r8.graph.DexField WARNING -> f
     com.android.tools.r8.graph.DexField SEVERE -> e
     com.android.tools.r8.graph.DexField FINE -> b
@@ -30116,7 +30246,7 @@
     com.android.tools.r8.graph.DexField FINER -> c
     1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):1245:1258 -> <init>
     1:6:void forEachFinalField(java.util.function.Consumer):1262:1267 -> a
-com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.internal.uh:
+com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.internal.yh:
     1:1:void <init>():914:914 -> <init>
     void forEachFinalField(java.util.function.Consumer) -> a
 com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.G0:
@@ -30128,7 +30258,7 @@
     12:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1280:1280 -> <init>
     1:1:void forEachFinalField(java.util.function.Consumer):1286:1286 -> a
     2:2:com.android.tools.r8.graph.DexField getTypeField():1291:1291 -> a
-com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.internal.vh:
+com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.internal.zh:
     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):1835:1840 -> <init>
@@ -30151,7 +30281,7 @@
     2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1451:1451 -> <init>
     3:47:void <init>(com.android.tools.r8.graph.DexItemFactory):1428:1472 -> <init>
     1:12:boolean isObjectMember(com.android.tools.r8.graph.DexMethod):1480:1491 -> a
-com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.internal.wh:
+com.android.tools.r8.graph.DexItemFactory$ObjectMethodsMembers -> com.android.tools.r8.internal.Ah:
     com.android.tools.r8.graph.DexMethod bootstrap -> a
     1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):1407:1418 -> <init>
     13:13:void <init>(com.android.tools.r8.graph.DexItemFactory):1411:1411 -> <init>
@@ -30175,7 +30305,7 @@
     23:39:void <init>(com.android.tools.r8.graph.DexItemFactory):1574:1590 -> <init>
     40:47:void <init>(com.android.tools.r8.graph.DexItemFactory):1588:1595 -> <init>
     48:48:void <init>(com.android.tools.r8.graph.DexItemFactory):1593:1593 -> <init>
-com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.internal.xh:
+com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.internal.Bh:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
@@ -30199,7 +30329,7 @@
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):2252:2252 -> <init>
     2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):2256:2261 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):2258:2258 -> <init>
-com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.internal.yh:
+com.android.tools.r8.graph.DexItemFactory$RecordMembers -> com.android.tools.r8.internal.Ch:
     com.android.tools.r8.graph.DexMethod toString -> d
     com.android.tools.r8.graph.DexMethod hashCode -> c
     com.android.tools.r8.graph.DexMethod equals -> b
@@ -30253,7 +30383,7 @@
     2190:2190:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2157:2157 -> a
     2187:2187:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.graph.DexMethod,java.util.List):2157:2157 -> a
     1:1:boolean isAppendPrimitiveMethod(com.android.tools.r8.graph.DexMethod):2118:2118 -> b
-com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.internal.zh:
+com.android.tools.r8.graph.DexItemFactory$StringConcatFactoryMembers -> com.android.tools.r8.internal.Dh:
     com.android.tools.r8.graph.DexMethod makeConcatWithConstants -> b
     com.android.tools.r8.graph.DexMethod makeConcat -> a
     1:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1337:1343 -> <init>
@@ -30300,30 +30430,30 @@
     5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1370:1373 -> <init>
     9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1372:1379 -> <init>
     17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1377:1377 -> <init>
-com.android.tools.r8.graph.DexItemFactory$VoidMembers -> com.android.tools.r8.internal.Ah:
+com.android.tools.r8.graph.DexItemFactory$VoidMembers -> com.android.tools.r8.internal.Eh:
     com.android.tools.r8.graph.DexField TYPE -> a
     1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):1352:1354 -> <init>
     1:1:com.android.tools.r8.graph.DexField getTypeField():1358:1358 -> a
 com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.O0:
-    boolean $assertionsDisabled -> t
+    boolean $assertionsDisabled -> u
     1:1:void <clinit>():24:24 -> <clinit>
-    1:26: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.MethodCollection$MethodCollectionFactory,boolean):44:69 -> <init>
+    1:27: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,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.MethodCollection$MethodCollectionFactory,boolean):45:71 -> <init>
     com.android.tools.r8.graph.ClasspathOrLibraryClass asClasspathOrLibraryClass() -> A
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> G
-    1:1:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):98:98 -> a
-    2:7:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):153:158 -> a
-    1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):81:83 -> c
-    1:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):88:89 -> f
+    1:1:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):100:100 -> a
+    2:7:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):155:160 -> a
+    1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):83:85 -> c
+    1:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):90:91 -> f
     boolean isLibraryClass() -> f0
-    1:1:java.lang.String toSourceString():108:108 -> k0
+    1:1:java.lang.String toSourceString():110:110 -> k0
     2:2:java.lang.String toSourceString():0:0 -> k0
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":110,"2":111,"3":112,"4":113}}
-    110:110:java.lang.String toSourceString():108:108 -> k0
-    111:111:java.lang.String toSourceString():108:108 -> k0
-    112:112:java.lang.String toSourceString():108:108 -> k0
-    113:113:java.lang.String toSourceString():108:108 -> k0
-    boolean isNotProgramClass() -> t1
-    1:1:java.lang.String toString():103:103 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":112,"2":113,"3":114,"4":115}}
+    112:112:java.lang.String toSourceString():110:110 -> k0
+    113:113:java.lang.String toSourceString():110:110 -> k0
+    114:114:java.lang.String toSourceString():110:110 -> k0
+    115:115:java.lang.String toSourceString():110:110 -> k0
+    1:1:java.lang.String toString():105:105 -> toString
+    boolean isNotProgramClass() -> w1
 com.android.tools.r8.graph.DexMember -> com.android.tools.r8.graph.P0:
     com.android.tools.r8.graph.DexString name -> g
     boolean $assertionsDisabled -> h
@@ -30346,11 +30476,11 @@
     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.internal.Bh:
+com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation -> com.android.tools.r8.internal.Fh:
     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.internal.Ch:
+com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation -> com.android.tools.r8.internal.Gh:
     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.internal.Dh:
+com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation -> com.android.tools.r8.internal.Hh:
     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.R0:
     com.android.tools.r8.graph.DexProto proto -> i
@@ -30399,7 +30529,7 @@
     27:27:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
     28:28:void collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     28:28:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
-    29:29:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    29:29:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     29:29:void collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193 -> a
     29:29:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     30:30:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):198:198 -> a
@@ -30417,7 +30547,7 @@
     192:192:boolean collectIndexedItemsExceptName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):185 -> b
     193:193:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> b
     193:193:boolean collectIndexedItemsExceptName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):185 -> b
-    194:194:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> b
+    194:194:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> b
     194:194:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> b
     194:194:boolean collectIndexedItemsExceptName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):185 -> b
     190:190:boolean collectIndexedItemsExceptName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):186:186 -> b
@@ -30427,15 +30557,15 @@
     197:197:boolean isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):300:300 -> b
     198:198:boolean com.android.tools.r8.graph.DexItemFactory.isConstructor(com.android.tools.r8.graph.DexMethod):2929:2929 -> b
     198:198:boolean isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):300 -> b
-    199:199:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):601:601 -> b
+    199:199:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):615:615 -> b
     199:199:com.android.tools.r8.graph.DexClassAndMethod lookupMemberOnClass(com.android.tools.r8.graph.DexClass):138 -> b
-    200:200:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):605:605 -> b
-    200:200:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):601 -> b
+    200:200:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.toClassMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):619:619 -> b
+    200:200:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.graph.DexClass.lookupClassMethod(com.android.tools.r8.graph.DexMethod):615 -> b
     200:200:com.android.tools.r8.graph.DexClassAndMethod lookupMemberOnClass(com.android.tools.r8.graph.DexClass):138 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):595:595 -> c
+    1:1:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):609:609 -> c
     1:1:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):133 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):610:610 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):595 -> c
+    2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):624:624 -> c
+    2:2:com.android.tools.r8.graph.DexEncodedMember com.android.tools.r8.graph.DexClass.lookupMember(com.android.tools.r8.graph.DexMember):609 -> c
     2:2:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):133 -> c
     3:3:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):133:133 -> c
     1:1:com.android.tools.r8.graph.DexType getParameter(int):86:86 -> h
@@ -30527,7 +30657,7 @@
     70:81:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):258:269 -> a
     82:82:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     82:82:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):269 -> a
-    83:83:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    83:83:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     83:83:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193 -> a
     83:83:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):269 -> a
     84:84:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):178:178 -> a
@@ -30536,7 +30666,7 @@
     85:85:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     85:85:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     85:85:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):272 -> a
-    86:86:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    86:86:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     86:86:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193 -> a
     86:86:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     86:86:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):272 -> a
@@ -30683,348 +30813,348 @@
     1:1:com.android.tools.r8.graph.DexString getName():139:139 -> a
     1:1:com.android.tools.r8.graph.DexProto getProto():144:144 -> b
 com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.Y0:
-    com.android.tools.r8.utils.OptionalBool reachabilitySensitive -> x
-    com.android.tools.r8.synthesis.SyntheticMarker syntheticMarker -> z
-    com.android.tools.r8.kotlin.KotlinClassLevelInfo kotlinInfo -> w
-    com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier checksumSupplier -> y
-    boolean deprecated -> v
-    com.android.tools.r8.cf.CfVersion initialClassFileVersion -> u
-    com.android.tools.r8.graph.DexProgramClass[] EMPTY_ARRAY -> A
-    boolean $assertionsDisabled -> B
-    com.android.tools.r8.ProgramResource$Kind originKind -> t
+    com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier checksumSupplier -> z
+    com.android.tools.r8.cf.CfVersion initialClassFileVersion -> v
+    com.android.tools.r8.kotlin.KotlinClassLevelInfo kotlinInfo -> x
+    com.android.tools.r8.synthesis.SyntheticMarker syntheticMarker -> A
+    boolean deprecated -> w
+    com.android.tools.r8.graph.DexProgramClass[] EMPTY_ARRAY -> B
+    com.android.tools.r8.ProgramResource$Kind originKind -> u
+    com.android.tools.r8.utils.OptionalBool reachabilitySensitive -> y
+    boolean $assertionsDisabled -> C
     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.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker):82:82 -> <init>
-    2:52: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.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker):53:103 -> <init>
-    53:53: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.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):125:125 -> <init>
-    1:1:void clearKotlinInfo():518:518 -> C1
-    1:1:java.lang.Iterable directProgramMethods():261:261 -> D1
+    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,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.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker):83:83 -> <init>
+    2:54: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,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.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.synthesis.SyntheticMarker):53:105 -> <init>
+    55:55: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,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.MethodCollection$MethodCollectionFactory,boolean,com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier):128:128 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
-    1:1:long getChecksum():827:827 -> E1
-    1:1:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier():831:831 -> F1
-    1:1:com.android.tools.r8.cf.CfVersion getInitialClassFileVersion():772:772 -> G1
-    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():508:508 -> H1
-    1:1:com.android.tools.r8.ProgramResource$Kind getOriginKind():392:392 -> I1
-    1:1:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():312:312 -> J1
-    2:2:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):351:351 -> J1
-    2:2:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():312 -> J1
-    1:1:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():316:316 -> K1
-    2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):320:320 -> K1
-    2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():316 -> K1
-    3:3:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):351:351 -> K1
-    3:3:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):320 -> K1
-    3:3:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():316 -> K1
-    1:1:boolean hasClassFileVersion():768:768 -> L1
-    1:1:boolean hasClassOrMemberAnnotations():631:631 -> M1
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):650:651 -> M1
-    2:3:boolean hasClassOrMemberAnnotations():632 -> M1
-    4:6:boolean hasClassOrMemberAnnotations():632:634 -> M1
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):652:652 -> M1
-    7:7:boolean hasClassOrMemberAnnotations():632 -> M1
-    1:1:boolean hasFields():618:618 -> N1
-    1:1:boolean hasMethods():622:622 -> O1
-    1:1:boolean hasOnlyInternalizableAnnotations():638:638 -> P1
-    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):650:651 -> P1
-    2:3:boolean hasOnlyInternalizableAnnotations():638 -> P1
-    4:6:boolean hasOnlyInternalizableAnnotations():638:640 -> P1
-    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):652:652 -> P1
-    7:7:boolean hasOnlyInternalizableAnnotations():638 -> P1
-    1:1:boolean isDeprecated():780:780 -> Q1
-    1:1:boolean originatesFromClassResource():400:400 -> R1
-    1:1:com.android.tools.r8.graph.DexType getContextType():748:748 -> S
-    1:1:boolean originatesFromDexResource():396:396 -> S1
-    1:1:java.lang.Iterable programInstanceInitializers():278:278 -> T1
-    1:1:void setDeprecated():776:776 -> U1
-    1:5:com.android.tools.r8.synthesis.SyntheticMarker stripSyntheticInputMarker():198:202 -> V1
-    1:1:java.lang.Iterable virtualProgramMethods():269:269 -> W1
+    1:1:void clearKotlinInfo():522:522 -> F1
+    1:1:java.lang.Iterable directProgramMethods():265:265 -> G1
+    1:1:long getChecksum():831:831 -> H1
+    1:1:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier():835:835 -> I1
+    1:1:com.android.tools.r8.cf.CfVersion getInitialClassFileVersion():776:776 -> J1
+    1:1:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo():512:512 -> K1
+    1:1:com.android.tools.r8.ProgramResource$Kind getOriginKind():396:396 -> L1
+    1:1:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():316:316 -> M1
+    2:2:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> M1
+    2:2:com.android.tools.r8.graph.ProgramMethod getProgramClassInitializer():316 -> M1
+    1:1:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():320:320 -> N1
+    2:2:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):324:324 -> N1
+    2:2:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():320 -> N1
+    3:3:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> N1
+    3:3:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):324 -> N1
+    3:3:com.android.tools.r8.graph.ProgramMethod getProgramDefaultInitializer():320 -> N1
+    1:1:boolean hasClassFileVersion():772:772 -> O1
+    1:1:boolean hasClassOrMemberAnnotations():635:635 -> P1
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):654:655 -> P1
+    2:3:boolean hasClassOrMemberAnnotations():636 -> P1
+    4:6:boolean hasClassOrMemberAnnotations():636:638 -> P1
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):656:656 -> P1
+    7:7:boolean hasClassOrMemberAnnotations():636 -> P1
+    1:1:boolean hasFields():622:622 -> Q1
+    1:1:boolean hasMethods():626:626 -> R1
+    1:1:com.android.tools.r8.graph.DexType getContextType():752:752 -> S
+    1:1:boolean hasOnlyInternalizableAnnotations():642:642 -> S1
+    2:3:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):654:655 -> S1
+    2:3:boolean hasOnlyInternalizableAnnotations():642 -> S1
+    4:6:boolean hasOnlyInternalizableAnnotations():642:644 -> S1
+    7:7:boolean hasAnnotations(com.android.tools.r8.graph.MethodCollection):656:656 -> S1
+    7:7:boolean hasOnlyInternalizableAnnotations():642 -> S1
+    1:1:boolean isDeprecated():784:784 -> T1
+    1:1:boolean originatesFromClassResource():404:404 -> U1
+    1:1:boolean originatesFromDexResource():400:400 -> V1
+    1:1:java.lang.Iterable programInstanceInitializers():282:282 -> W1
+    1:1:void setDeprecated():780:780 -> X1
+    1:5:com.android.tools.r8.synthesis.SyntheticMarker stripSyntheticInputMarker():202:206 -> Y1
+    1:1:java.lang.Iterable virtualProgramMethods():273:273 -> Z1
     1:1:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):18:18 -> a
-    1:1:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):426 -> a
+    1:1:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):430 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:4:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):18:20 -> a
-    2:4:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):426 -> a
+    2:4:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):430 -> a
     5:5:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):124:124 -> a
     5:5:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):20 -> a
-    5:5:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):426 -> a
+    5:5:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):430 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     6:6:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):124:124 -> a
     6:6:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):20 -> a
-    6:6:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):426 -> a
+    6:6:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):430 -> a
     7:7:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
     7:7:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):125 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):20 -> a
-    7:7:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):426 -> a
+    7:7:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):430 -> a
     8:8:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
     8:8:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):125 -> a
     8:8:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):20 -> a
-    8:8:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):426 -> a
+    8:8:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):430 -> a
     9:10:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):21:22 -> a
-    9:10:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):426 -> a
-    11:11:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):152:152 -> a
-    12:26:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):207:221 -> a
-    27:27:boolean lambda$forEachProgramInstanceInitializerMatching$19(java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod):298:298 -> a
-    28:28:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$21(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):367:367 -> a
-    29:29:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$22(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):372:372 -> a
-    30:31:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):383:384 -> a
-    32:34:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$23(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):386:388 -> a
-    35:36:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):405:406 -> a
+    9:10:void lambda$collectIndexedItems$24(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):430 -> a
+    11:11:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):156:156 -> a
+    12:26:void specify(com.android.tools.r8.utils.structural.StructuralSpecification):211:225 -> a
+    27:27:boolean lambda$forEachProgramInstanceInitializerMatching$19(java.util.function.Predicate,com.android.tools.r8.graph.DexEncodedMethod):302:302 -> a
+    28:28:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$21(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):371:371 -> a
+    29:29:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$22(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):376:376 -> a
+    30:31:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):387:388 -> a
+    32:34:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$23(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):390:392 -> a
+    35:36:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):409:410 -> a
     37:37:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):242:242 -> a
-    37:37:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):406 -> a
+    37:37:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):410 -> a
     38:38:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1299,"2":1300,"3":1301,"4":1302}}
-    1299:1299:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    1299:1299:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):406 -> a
-    1300:1300:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    1300:1300:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):406 -> a
-    1301:1301:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    1301:1301:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):406 -> a
-    1302:1302:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    1302:1302:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
-    1302:1302:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):406 -> a
-    445:445:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):407:407 -> a
-    446:446:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):242:242 -> a
-    446:446:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):408 -> a
-    447:447:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1303,"2":1304,"3":1305,"4":1306}}
-    1303:1303:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    1303:1303:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):408 -> a
-    1304:1304:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    1304:1304:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):408 -> a
-    1305:1305:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    1305:1305:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):408 -> a
-    1306:1306:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    1306:1306:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
-    1306:1306:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):408 -> a
-    857:859:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):410:412 -> a
-    860:860:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    860:860:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):413 -> a
-    861:861:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):415:415 -> a
-    862:862:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):124:124 -> a
-    862:862:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):415 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1311,"2":1312,"3":1313,"4":1314}}
+    1311:1311:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
+    1311:1311:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):410 -> a
+    1312:1312:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
+    1312:1312:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):410 -> a
+    1313:1313:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
+    1313:1313:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):410 -> a
+    1314:1314:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
+    1314:1314:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
+    1314:1314:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):410 -> a
+    449:449:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):411:411 -> a
+    450:450:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):242:242 -> a
+    450:450:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):412 -> a
+    451:451:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1315,"2":1316,"3":1317,"4":1318}}
+    1315:1315:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
+    1315:1315:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):412 -> a
+    1316:1316:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
+    1316:1316:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):412 -> a
+    1317:1317:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
+    1317:1317:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):412 -> a
+    1318:1318:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
+    1318:1318:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
+    1318:1318:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):412 -> a
+    865:867:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):414:416 -> a
+    868:868:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
+    868:868:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):417 -> a
+    869:869:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):419:419 -> a
+    870:870:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):124:124 -> a
+    870:870:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):419 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    863:863:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):124:124 -> a
-    863:863:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):415 -> a
-    864:864:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
-    864:864:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):125 -> a
+    871:871:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):124:124 -> a
+    871:871:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):419 -> a
+    872:872:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
+    872:872:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):125 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    864:864:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):415 -> a
-    865:865:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
-    865:865:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):125 -> a
-    865:865:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):415 -> a
-    866:866:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):416:416 -> a
-    867:868:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):113:114 -> a
-    867:868:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):417 -> a
-    869:869:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):242:242 -> a
-    869:869:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    869:869:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):417 -> a
-    870:870:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1307,"2":1308,"3":1309,"4":1310}}
-    1307:1307:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    1307:1307:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    1307:1307:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):417 -> a
-    1308:1308:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    1308:1308:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    1308:1308:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):417 -> a
-    1309:1309:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    1309:1309:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    1309:1309:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):417 -> a
-    1310:1310:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    1310:1310:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
-    1310:1310:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
-    1310:1310:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):417 -> a
-    1289:1296:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):419:426 -> a
-    1297:1297:void forEachProgramField(java.util.function.Consumer):225:225 -> a
-    1297:1297:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):426 -> a
-    1298:1298:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):427:427 -> a
-    1311:1315:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):433:437 -> a
-    1316:1316:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):449:449 -> a
-    1317:1317:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):751:751 -> a
-    1317:1317:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):449 -> a
-    1318:1318:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):498:498 -> a
-    1319:1321:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):512:514 -> a
-    1322:1326:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):527:531 -> a
-    1327:1334:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):541:548 -> a
-    1327:1334:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):533 -> a
-    1335:1335:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):603:603 -> a
-    1335:1335:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):549 -> a
-    1335:1335:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):533 -> a
-    1336:1338: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):146:148 -> a
-    1336:1338:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):604 -> a
-    1336:1338:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):549 -> a
-    1336:1338:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):533 -> a
-    1339:1340:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):608:609 -> a
-    1339:1340:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):549 -> a
-    1339:1340:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):533 -> a
-    1341:1343: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):146:148 -> a
-    1341:1343:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):609 -> a
-    1341:1343:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):549 -> a
-    1341:1343:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):533 -> a
-    1344:1344:int lambda$computeStaticValuesArray$27(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):662:662 -> a
-    1345:1347:boolean hasNonDefaultStaticFieldValues():680:682 -> a
-    1345:1347:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):657 -> a
-    1348:1348:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
-    1348:1348:boolean hasNonDefaultStaticFieldValues():682 -> a
-    1348:1348:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):657 -> a
-    1349:1359:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):660:670 -> a
+    872:872:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):419 -> a
+    873:873:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):105:105 -> a
+    873:873:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):125 -> a
+    873:873:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):419 -> a
+    874:874:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):420:420 -> a
+    875:876:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):113:114 -> a
+    875:876:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):421 -> a
+    877:877:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):242:242 -> a
+    877:877:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    877:877:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):421 -> a
+    878:878:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1319,"2":1320,"3":1321,"4":1322}}
+    1319:1319:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
+    1319:1319:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    1319:1319:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):421 -> a
+    1320:1320:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
+    1320:1320:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    1320:1320:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):421 -> a
+    1321:1321:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
+    1321:1321:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    1321:1321:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):421 -> a
+    1322:1322:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
+    1322:1322:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
+    1322:1322:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
+    1322:1322:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):421 -> a
+    1301:1308:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):423:430 -> a
+    1309:1309:void forEachProgramField(java.util.function.Consumer):229:229 -> a
+    1309:1309:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):430 -> a
+    1310:1310:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):431:431 -> a
+    1323:1327:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):437:441 -> a
+    1328:1328:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):453:453 -> a
+    1329:1329:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):751:751 -> a
+    1329:1329:void lambda$addDependencies$26(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):453 -> a
+    1330:1330:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):502:502 -> a
+    1331:1333:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):516:518 -> a
+    1334:1338:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):531:535 -> a
+    1339:1346:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):545:552 -> a
+    1339:1346:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):537 -> a
+    1347:1347:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):607:607 -> a
+    1347:1347:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):553 -> a
+    1347:1347:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):537 -> a
+    1348:1350: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):146:148 -> a
+    1348:1350:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):608 -> a
+    1348:1350:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):553 -> a
+    1348:1350:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):537 -> a
+    1351:1352:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):612:613 -> a
+    1351:1352:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):553 -> a
+    1351:1352:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):537 -> a
+    1353:1355: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):146:148 -> a
+    1353:1355:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):613 -> a
+    1353:1355:boolean internalClassMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):553 -> a
+    1353:1355:boolean internalClassOrInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):537 -> a
+    1356:1356:int lambda$computeStaticValuesArray$27(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):666:666 -> a
+    1357:1359:boolean hasNonDefaultStaticFieldValues():684:686 -> a
+    1357:1359:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):661 -> a
     1360:1360:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
-    1360:1360:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):670 -> a
-    1361:1361:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):675:675 -> a
-    1362:1363:void downgradeInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):763:764 -> a
-    1364:1364:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):785:785 -> a
-    1365:1365:java.util.Iterator lambda$asProgramClasses$28(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):786:786 -> a
-    1366:1366:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):818:818 -> a
-    1367:1367:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1367:1367:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):818 -> a
-    1368:1368:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):818:818 -> a
+    1360:1360:boolean hasNonDefaultStaticFieldValues():686 -> a
+    1360:1360:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):661 -> a
+    1361:1371:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):664:674 -> a
+    1372:1372:boolean com.android.tools.r8.graph.DexValue.isDefault(com.android.tools.r8.graph.DexType):412:412 -> a
+    1372:1372:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):674 -> a
+    1373:1373:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):679:679 -> a
+    1374:1375:void downgradeInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):767:768 -> a
+    1376:1376:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):789:789 -> a
+    1377:1377:java.util.Iterator lambda$asProgramClasses$28(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):790:790 -> a
+    1378:1378:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):822:822 -> a
+    1379:1379:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1379:1379:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):822 -> a
+    1380:1380:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):822:822 -> a
     com.android.tools.r8.graph.DexClass getContextClass() -> b
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> b
     1:1:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69:69 -> b
-    1:1:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):427 -> b
+    1:1:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):431 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:4:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69:71 -> b
-    2:4:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):427 -> b
+    2:4:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):431 -> b
     5:5:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):178:178 -> b
     5:5:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):71 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):427 -> b
+    5:5:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):431 -> b
     6:6:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193:193 -> b
     6:6:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> b
     6:6:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):71 -> b
-    6:6:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):427 -> b
-    7:7:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> b
+    6:6:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):431 -> b
+    7:7:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> b
     7:7:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193 -> b
     7:7:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> b
     7:7:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):71 -> b
-    7:7:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):427 -> b
+    7:7:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):431 -> b
     8:12:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):72:76 -> b
-    8:12:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):427 -> b
+    8:12:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):431 -> b
     13:13:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):124:124 -> b
     13:13:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76 -> b
-    13:13:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):427 -> b
+    13:13:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):431 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     14:14:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):124:124 -> b
     14:14:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76 -> b
-    14:14:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):427 -> b
+    14:14:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):431 -> b
     15:15:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):105:105 -> b
     15:15:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):125 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     15:15:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76 -> b
-    15:15:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):427 -> b
+    15:15:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):431 -> b
     16:16:void com.android.tools.r8.graph.DexAnnotation.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):105:105 -> b
     16:16:void com.android.tools.r8.graph.DexAnnotationSet.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):125 -> b
     16:16:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):76 -> b
-    16:16:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):427 -> b
+    16:16:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):431 -> b
     17:17:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):77:77 -> b
-    17:17:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):427 -> b
-    18:18:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexProgramClass):207:207 -> b
-    19:19:void lambda$forEachProgramFieldMatching$10(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):230:230 -> b
-    20:20:void lambda$forEachProgramDirectMethodMatching$18(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):288:288 -> b
-    21:21:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):320:320 -> b
-    22:22:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):351:351 -> b
-    22:22:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):320 -> b
-    23:23:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):367:367 -> b
-    24:26:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):443:445 -> b
-    27:27:boolean hasMethodsOrFields():626:626 -> b
-    27:27:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):447 -> b
-    28:29:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):448:449 -> b
+    17:17:void lambda$collectIndexedItems$25(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):431 -> b
+    18:18:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.DexProgramClass):211:211 -> b
+    19:19:void lambda$forEachProgramFieldMatching$10(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):234:234 -> b
+    20:20:void lambda$forEachProgramDirectMethodMatching$18(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):292:292 -> b
+    21:21:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):324:324 -> b
+    22:22:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> b
+    22:22:com.android.tools.r8.graph.ProgramMethod getProgramInitializer(com.android.tools.r8.graph.DexType[]):324 -> b
+    23:23:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):371:371 -> b
+    24:26:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):447:449 -> b
+    27:27:boolean hasMethodsOrFields():630:630 -> b
+    27:27:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):451 -> b
+    28:29:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):452:453 -> b
     30:30:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):126:126 -> b
-    30:30:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):449 -> b
+    30:30:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):453 -> b
     31:31:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):126:126 -> b
-    31:31:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):449 -> b
+    31:31:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):453 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:35:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):450:453 -> b
+    32:35:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):454:457 -> b
     36:37:void com.android.tools.r8.graph.DexAnnotationSet.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):131:132 -> b
-    36:37:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):453 -> b
-    38:38:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):454:454 -> b
+    36:37:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):457 -> b
+    38:38:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):458:458 -> b
     39:39:void com.android.tools.r8.graph.DexTypeList.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):120:120 -> b
-    39:39:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):455 -> b
-    40:58:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):572:590 -> b
-    59:59:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):603:603 -> b
-    59:59:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):594 -> b
+    39:39:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):459 -> b
+    40:58:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):576:594 -> b
+    59:59:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):607:607 -> b
+    59:59:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):598 -> b
     60:62: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):146:148 -> b
-    60:62:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):604 -> b
-    60:62:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):594 -> b
-    63:64:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):608:609 -> b
-    63:64:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):594 -> b
+    60:62:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):608 -> b
+    60:62:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):598 -> b
+    63:64:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):612:613 -> b
+    63:64:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):598 -> b
     65:67: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):146:148 -> b
-    65:67:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):609 -> b
-    65:67:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):594 -> b
-    68:68:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> b
-    68:68:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):475 -> b
-    69:69:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> b
-    69:69:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):478 -> b
+    65:67:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):613 -> b
+    65:67:boolean internalInterfaceMayHaveInitializationSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.Set):598 -> b
+    68:68:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> b
+    68:68:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):479 -> b
+    69:69:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> b
+    69:69:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):482 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    70:70:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> b
-    70:70:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):478 -> b
-    71:74:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):479:482 -> b
-    75:77:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):757:759 -> b
-    1:1:com.android.tools.r8.graph.DexType lambda$specify$1(com.android.tools.r8.graph.DexProgramClass):208:208 -> c
-    2:2:void lambda$forEachProgramInstanceField$11(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):234:234 -> c
-    3:3:void lambda$forEachProgramMethodMatching$13(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):253:253 -> c
-    4:4:com.android.tools.r8.utils.TraversalContinuation traverseProgramInstanceInitializers(java.util.function.Function):377:377 -> c
-    5:7:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):644:646 -> c
-    8:8:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):690:690 -> c
-    9:9:void addExtraInterfaces(java.util.List):703:703 -> c
-    10:13:void addExtraInterfacesToInterfacesArray(java.util.List):711:714 -> c
-    10:13:void addExtraInterfaces(java.util.List):706 -> c
+    70:70:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> b
+    70:70:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):482 -> b
+    71:74:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):483:486 -> b
+    75:77:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):761:763 -> b
+    1:1:com.android.tools.r8.graph.DexType lambda$specify$1(com.android.tools.r8.graph.DexProgramClass):212:212 -> c
+    2:2:void lambda$forEachProgramInstanceField$11(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):238:238 -> c
+    3:3:void lambda$forEachProgramMethodMatching$13(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):257:257 -> c
+    4:4:com.android.tools.r8.utils.TraversalContinuation traverseProgramInstanceInitializers(java.util.function.Function):381:381 -> c
+    5:7:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):648:650 -> c
+    8:8:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):694:694 -> c
+    9:9:void addExtraInterfaces(java.util.List):707:707 -> c
+    10:13:void addExtraInterfacesToInterfacesArray(java.util.List):715:718 -> c
+    10:13:void addExtraInterfaces(java.util.List):710 -> c
     14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():601:601 -> c
-    14:14:void addExtraInterfacesToInterfacesArray(java.util.List):714 -> c
+    14:14:void addExtraInterfacesToInterfacesArray(java.util.List):718 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:void addExtraInterfaces(java.util.List):706 -> c
-    15:17:void addExtraInterfacesToInterfacesArray(java.util.List):714:716 -> c
-    15:17:void addExtraInterfaces(java.util.List):706 -> c
-    18:30:void addExtraInterfacesToSignatureIfPresent(java.util.List):721:733 -> c
-    18:30:void addExtraInterfaces(java.util.List):707 -> c
-    1:1:boolean getOrComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):174:174 -> d
-    2:5:boolean internalComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):181:184 -> d
-    2:5:boolean getOrComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):175 -> d
-    6:8:boolean getOrComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):175:177 -> d
-    9:9:com.android.tools.r8.graph.DexTypeList lambda$specify$2(com.android.tools.r8.graph.DexProgramClass):209:209 -> d
-    10:10:void forEachProgramDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):287:287 -> d
-    11:11:void lambda$forEachProgramVirtualMethodMatching$20(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):308:308 -> d
-    12:12:com.android.tools.r8.graph.ProgramField lookupProgramField(com.android.tools.r8.graph.DexField):335:335 -> d
-    13:13:com.android.tools.r8.graph.ProgramField toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):344:344 -> d
-    13:13:com.android.tools.r8.graph.ProgramField lookupProgramField(com.android.tools.r8.graph.DexField):335 -> d
-    14:14:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function):372:372 -> d
-    15:15:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):694:694 -> d
+    14:14:void addExtraInterfaces(java.util.List):710 -> c
+    15:17:void addExtraInterfacesToInterfacesArray(java.util.List):718:720 -> c
+    15:17:void addExtraInterfaces(java.util.List):710 -> c
+    18:30:void addExtraInterfacesToSignatureIfPresent(java.util.List):725:737 -> c
+    18:30:void addExtraInterfaces(java.util.List):711 -> c
+    1:1:boolean getOrComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):178:178 -> d
+    2:5:boolean internalComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):185:188 -> d
+    2:5:boolean getOrComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):179 -> d
+    6:8:boolean getOrComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):179:181 -> d
+    9:9:com.android.tools.r8.graph.DexTypeList lambda$specify$2(com.android.tools.r8.graph.DexProgramClass):213:213 -> d
+    10:10:void forEachProgramDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):291:291 -> d
+    11:11:void lambda$forEachProgramVirtualMethodMatching$20(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):312:312 -> d
+    12:12:com.android.tools.r8.graph.ProgramField lookupProgramField(com.android.tools.r8.graph.DexField):339:339 -> d
+    13:13:com.android.tools.r8.graph.ProgramField toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):348:348 -> d
+    13:13:com.android.tools.r8.graph.ProgramField lookupProgramField(com.android.tools.r8.graph.DexField):339 -> d
+    14:14:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function):376:376 -> d
+    15:15:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):698:698 -> d
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> d0
     com.android.tools.r8.graph.DexDefinition getDefinition() -> e
-    1:1:com.android.tools.r8.graph.ClassAccessFlags lambda$specify$3(com.android.tools.r8.graph.DexProgramClass):210:210 -> e
-    2:2:void forEachProgramFieldMatching(java.util.function.Predicate,java.util.function.Consumer):230:230 -> e
-    3:3:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$14(com.android.tools.r8.graph.DexEncodedMethod):261:261 -> e
+    1:1:com.android.tools.r8.graph.ClassAccessFlags lambda$specify$3(com.android.tools.r8.graph.DexProgramClass):214:214 -> e
+    2:2:void forEachProgramFieldMatching(java.util.function.Predicate,java.util.function.Consumer):234:234 -> e
+    3:3:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$14(com.android.tools.r8.graph.DexEncodedMethod):265:265 -> e
     boolean isProgramClass() -> e0
-    1:1:com.android.tools.r8.graph.DexString lambda$specify$4(com.android.tools.r8.graph.DexProgramClass):211:211 -> f
-    2:2:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$15(com.android.tools.r8.graph.DexEncodedMethod):265:265 -> f
-    3:3:void forEachProgramInstanceInitializerMatching(java.util.function.Predicate,java.util.function.Consumer):297:297 -> f
-    4:4:com.android.tools.r8.graph.ProgramMethod lookupProgramMethod(com.android.tools.r8.graph.DexMethod):339:339 -> f
-    5:5:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):351:351 -> f
-    5:5:com.android.tools.r8.graph.ProgramMethod lookupProgramMethod(com.android.tools.r8.graph.DexMethod):339 -> f
-    1:1:com.android.tools.r8.cf.CfVersion lambda$specify$5(com.android.tools.r8.graph.DexProgramClass):212:212 -> g
-    2:2:void forEachProgramMethodMatching(java.util.function.Predicate,java.util.function.Consumer):252:252 -> g
-    3:3:com.android.tools.r8.graph.ProgramMethod lambda$virtualProgramMethods$16(com.android.tools.r8.graph.DexEncodedMethod):269:269 -> g
-    1:1:boolean lambda$specify$6(com.android.tools.r8.graph.DexProgramClass):213:213 -> h
-    2:2:void forEachProgramVirtualMethodMatching(java.util.function.Predicate,java.util.function.Consumer):307:307 -> h
-    1:1:boolean lambda$specify$7(com.android.tools.r8.graph.DexProgramClass):218:218 -> i
-    1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$8(com.android.tools.r8.graph.DexProgramClass):219:219 -> j
-    2:2:void forEachProgramInstanceField(java.util.function.Consumer):234:234 -> j
-    1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$9(com.android.tools.r8.graph.DexProgramClass):220:220 -> k
-    2:2:void forEachProgramField(java.util.function.Consumer):225:225 -> k
-    2:2:void forEachProgramMember(java.util.function.Consumer):242 -> k
-    3:3:void forEachProgramMember(java.util.function.Consumer):243:243 -> k
-    1:1:java.lang.String toSourceString():466:466 -> k0
-    1:1:void forEachProgramMethod(java.util.function.Consumer):247:247 -> l
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():194:194 -> m
-    2:2:java.lang.Iterable directProgramMethods(java.util.function.Predicate):265:265 -> m
-    boolean isNotProgramClass() -> t1
-    1:1:java.lang.String toString():461:461 -> toString
+    1:1:com.android.tools.r8.graph.DexString lambda$specify$4(com.android.tools.r8.graph.DexProgramClass):215:215 -> f
+    2:2:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$15(com.android.tools.r8.graph.DexEncodedMethod):269:269 -> f
+    3:3:void forEachProgramInstanceInitializerMatching(java.util.function.Predicate,java.util.function.Consumer):301:301 -> f
+    4:4:com.android.tools.r8.graph.ProgramMethod lookupProgramMethod(com.android.tools.r8.graph.DexMethod):343:343 -> f
+    5:5:com.android.tools.r8.graph.ProgramMethod toProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> f
+    5:5:com.android.tools.r8.graph.ProgramMethod lookupProgramMethod(com.android.tools.r8.graph.DexMethod):343 -> f
+    1:1:com.android.tools.r8.cf.CfVersion lambda$specify$5(com.android.tools.r8.graph.DexProgramClass):216:216 -> g
+    2:2:void forEachProgramMethodMatching(java.util.function.Predicate,java.util.function.Consumer):256:256 -> g
+    3:3:com.android.tools.r8.graph.ProgramMethod lambda$virtualProgramMethods$16(com.android.tools.r8.graph.DexEncodedMethod):273:273 -> g
+    1:1:boolean lambda$specify$6(com.android.tools.r8.graph.DexProgramClass):217:217 -> h
+    2:2:void forEachProgramVirtualMethodMatching(java.util.function.Predicate,java.util.function.Consumer):311:311 -> h
+    1:1:boolean lambda$specify$7(com.android.tools.r8.graph.DexProgramClass):222:222 -> i
+    1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$8(com.android.tools.r8.graph.DexProgramClass):223:223 -> j
+    2:2:void forEachProgramInstanceField(java.util.function.Consumer):238:238 -> j
+    1:1:com.android.tools.r8.graph.DexEncodedField[] lambda$specify$9(com.android.tools.r8.graph.DexProgramClass):224:224 -> k
+    2:2:void forEachProgramField(java.util.function.Consumer):229:229 -> k
+    2:2:void forEachProgramMember(java.util.function.Consumer):246 -> k
+    3:3:void forEachProgramMember(java.util.function.Consumer):247:247 -> k
+    1:1:java.lang.String toSourceString():470:470 -> k0
+    1:1:void forEachProgramMethod(java.util.function.Consumer):251:251 -> l
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():198:198 -> m
+    2:2:java.lang.Iterable directProgramMethods(java.util.function.Predicate):269:269 -> m
+    1:1:java.lang.String toString():465:465 -> toString
+    boolean isNotProgramClass() -> w1
 com.android.tools.r8.graph.DexProgramClass$1 -> com.android.tools.r8.graph.X0:
     java.util.Iterator iterator -> c
     com.android.tools.r8.graph.DexProgramClass next -> b
     com.android.tools.r8.graph.DexDefinitionSupplier val$definitions -> d
-    1:5:void <init>(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):786:790 -> <init>
-    1:1:boolean hasNext():794:794 -> hasNext
-    1:5:com.android.tools.r8.graph.DexProgramClass findNext():805:809 -> j
-    1:2:com.android.tools.r8.graph.DexProgramClass next():799:800 -> next
-    1:2:java.lang.Object next():786 -> next
+    1:5:void <init>(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):790:794 -> <init>
+    1:1:boolean hasNext():798:798 -> hasNext
+    1:5:com.android.tools.r8.graph.DexProgramClass findNext():809:813 -> j
+    1:2:com.android.tools.r8.graph.DexProgramClass next():803:804 -> next
+    1:2:java.lang.Object next():790 -> next
 com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier -> com.android.tools.r8.graph.Y0$a:
     long getChecksum(com.android.tools.r8.graph.DexProgramClass) -> a
 com.android.tools.r8.graph.DexProto -> com.android.tools.r8.graph.Z0:
@@ -31051,7 +31181,7 @@
     141:141:java.lang.Iterable getBaseTypes(com.android.tools.r8.graph.DexItemFactory):70 -> a
     142:142:java.lang.Iterable getBaseTypes(com.android.tools.r8.graph.DexItemFactory):70:70 -> a
     143:144:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):100:101 -> a
-    145:145:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    145:145:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     145:145:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):101 -> a
     146:146:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):102:102 -> a
     147:147:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):242:242 -> a
@@ -31064,7 +31194,7 @@
     258:258:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):102 -> a
     259:259:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     259:259:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):102 -> a
-    260:260:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    260:260:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     260:260:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     260:260:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):102 -> a
     251:251:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):103:103 -> a
@@ -31087,7 +31217,7 @@
     263:263:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     263:263:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
     263:263:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):103 -> a
-    264:264:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    264:264:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     264:264:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     264:264:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):114 -> a
     264:264:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):103 -> a
@@ -31141,66 +31271,67 @@
     4:6:void <init>(java.lang.String):33:35 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
     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.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
+    2:2:int acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):69:69 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):20 -> a
     3:3:int compareTo(com.android.tools.r8.utils.structural.StructuralItem):20:20 -> a
-    4:4:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):70:70 -> a
-    5:21:int decodePrefix(char[]):154:170 -> a
-    22:34:int decodePrefix(char[]):168:180 -> a
-    35:42:int decodePrefix(char[]):178:185 -> a
-    43:45:int countBytes(java.lang.String):230:232 -> a
-    43:45:byte[] encodeToMutf8(java.lang.String):249 -> a
-    46:51:byte[] encodeToMutf8(java.lang.String):249:254 -> a
-    52:59:int encodeToMutf8(char,byte[],int):260:267 -> a
-    60:60:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):278:278 -> a
-    61:73:int internalCompareTo(com.android.tools.r8.graph.DexString):290:302 -> a
-    61:73:int compareTo(com.android.tools.r8.graph.DexString):60 -> a
-    74:76:boolean isValidSimpleName(com.android.tools.r8.utils.AndroidApiLevel):419:421 -> a
-    77:84:boolean isValidSimpleName(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):404:411 -> a
-    77:84:boolean isValidSimpleName(com.android.tools.r8.utils.AndroidApiLevel):421 -> a
-    85:89:boolean startsWith(byte[]):452:456 -> a
-    90:90:int getArrayDim():529:529 -> a
-    90:90:com.android.tools.r8.graph.DexString withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):496 -> a
-    91:108:com.android.tools.r8.graph.DexString withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):497:514 -> a
-    109:109:int getArrayDim():529:529 -> a
-    109:109:com.android.tools.r8.graph.DexString withoutArray(com.android.tools.r8.graph.DexItemFactory):518 -> a
-    110:112:com.android.tools.r8.graph.DexString withoutArray(com.android.tools.r8.graph.DexItemFactory):522:524 -> a
-    1:5:boolean endsWith(com.android.tools.r8.graph.DexString):480:484 -> b
+    4:4:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74:74 -> a
+    5:21:int decodePrefix(char[]):158:174 -> a
+    22:34:int decodePrefix(char[]):172:184 -> a
+    35:42:int decodePrefix(char[]):182:189 -> a
+    43:45:int countBytes(java.lang.String):234:236 -> a
+    43:45:byte[] encodeToMutf8(java.lang.String):253 -> a
+    46:51:byte[] encodeToMutf8(java.lang.String):253:258 -> a
+    52:59:int encodeToMutf8(char,byte[],int):264:271 -> a
+    60:60:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):282:282 -> a
+    61:73:int internalCompareTo(com.android.tools.r8.graph.DexString):294:306 -> a
+    61:73:int compareTo(com.android.tools.r8.graph.DexString):64 -> a
+    74:76:boolean isValidSimpleName(com.android.tools.r8.utils.AndroidApiLevel):423:425 -> a
+    77:84:boolean isValidSimpleName(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):408:415 -> a
+    77:84:boolean isValidSimpleName(com.android.tools.r8.utils.AndroidApiLevel):425 -> a
+    85:89:boolean startsWith(byte[]):456:460 -> a
+    90:90:int getArrayDim():533:533 -> a
+    90:90:com.android.tools.r8.graph.DexString withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):500 -> a
+    91:108:com.android.tools.r8.graph.DexString withNewPrefix(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):501:518 -> a
+    109:109:int getArrayDim():533:533 -> a
+    109:109:com.android.tools.r8.graph.DexString withoutArray(com.android.tools.r8.graph.DexItemFactory):522 -> a
+    110:112:com.android.tools.r8.graph.DexString withoutArray(com.android.tools.r8.graph.DexItemFactory):526:528 -> a
+    1:5:boolean endsWith(com.android.tools.r8.graph.DexString):484:488 -> b
     1:1:int compareTo(java.lang.Object):20:20 -> compareTo
-    1:3:boolean computeEquals(java.lang.Object):120:122 -> h
-    1:1:int computeHashCode():115:115 -> l0
-    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():50:50 -> m
-    1:3:java.lang.String decode():145:147 -> m0
-    1:32:int decodedHashCode():191:222 -> n0
-    33:46:int decodedHashCode():205:218 -> n0
-    1:11:java.lang.String dump():430:440 -> o0
-    1:1:boolean isValidClassDescriptor():396:396 -> p0
-    2:13:boolean isValidClassDescriptor(java.lang.String):314:325 -> p0
-    2:13:boolean isValidClassDescriptor():396 -> p0
-    14:14:boolean isValidClassDescriptor(java.lang.String):323:323 -> p0
-    14:14:boolean isValidClassDescriptor():396 -> p0
-    1:1:boolean isValidFieldName():388:388 -> q0
-    2:18:boolean isValidFieldName(java.lang.String):355:371 -> q0
-    2:18:boolean isValidFieldName():388 -> q0
-    19:19:boolean isValidFieldName(java.lang.String):369:369 -> q0
-    19:19:boolean isValidFieldName():388 -> q0
-    1:1:boolean isValidMethodName():380:380 -> r0
-    2:16:boolean isValidMethodName(java.lang.String):333:347 -> r0
-    2:16:boolean isValidMethodName():380 -> r0
-    17:17:boolean isValidMethodName(java.lang.String):345:345 -> r0
-    17:17:boolean isValidMethodName():380 -> r0
-    1:1:com.android.tools.r8.utils.ThrowingCharIterator iterator():74:74 -> s0
-    1:3:java.lang.String toASCIIString():138:140 -> t0
-    1:3:java.lang.String toString():130:132 -> toString
+    1:3:boolean computeEquals(java.lang.Object):124:126 -> h
+    1:1:int computeHashCode():119:119 -> l0
+    1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():54:54 -> m
+    1:3:java.lang.String decode():149:151 -> m0
+    1:32:int decodedHashCode():195:226 -> n0
+    33:46:int decodedHashCode():209:222 -> n0
+    1:11:java.lang.String dump():434:444 -> o0
+    1:1:char getFirstByteAsChar():39:39 -> p0
+    1:1:boolean isValidClassDescriptor():400:400 -> q0
+    2:13:boolean isValidClassDescriptor(java.lang.String):318:329 -> q0
+    2:13:boolean isValidClassDescriptor():400 -> q0
+    14:14:boolean isValidClassDescriptor(java.lang.String):327:327 -> q0
+    14:14:boolean isValidClassDescriptor():400 -> q0
+    1:1:boolean isValidFieldName():392:392 -> r0
+    2:18:boolean isValidFieldName(java.lang.String):359:375 -> r0
+    2:18:boolean isValidFieldName():392 -> r0
+    19:19:boolean isValidFieldName(java.lang.String):373:373 -> r0
+    19:19:boolean isValidFieldName():392 -> r0
+    1:1:boolean isValidMethodName():384:384 -> s0
+    2:16:boolean isValidMethodName(java.lang.String):337:351 -> s0
+    2:16:boolean isValidMethodName():384 -> s0
+    17:17:boolean isValidMethodName(java.lang.String):349:349 -> s0
+    17:17:boolean isValidMethodName():384 -> s0
+    1:1:com.android.tools.r8.utils.ThrowingCharIterator iterator():78:78 -> t0
+    1:3:java.lang.String toString():134:136 -> toString
+    1:3:java.lang.String toASCIIString():142:144 -> u0
 com.android.tools.r8.graph.DexString$1 -> com.android.tools.r8.graph.b1:
     com.android.tools.r8.graph.DexString this$0 -> b
     boolean $assertionsDisabled -> c
     int i -> a
-    1:1:void <clinit>():74:74 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexString):74:76 -> <init>
-    1:24:char nextChar():80:103 -> a
-    25:25:char nextChar():81:81 -> a
-    1:1:boolean hasNext():108:108 -> hasNext
+    1:1:void <clinit>():78:78 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexString):78:80 -> <init>
+    1:24:char nextChar():84:107 -> a
+    25:25:char nextChar():85:85 -> a
+    1:1:boolean hasNext():112:112 -> hasNext
 com.android.tools.r8.graph.DexType -> com.android.tools.r8.graph.d1:
     java.lang.String toStringCache -> g
     boolean $assertionsDisabled -> j
@@ -31266,18 +31397,18 @@
     270:270:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     271:271:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     272:272:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    273:273:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection) -> a
+    273:273:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     273:273:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     274:274:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):255:255 -> a
     275:277:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):438:440 -> a
     278:278:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):471:471 -> a
     278:278:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):440 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    279:279:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):536:536 -> a
+    279:279:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):540:540 -> a
     279:279:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):471 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     279:279:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):440 -> a
-    280:283:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):536:539 -> a
+    280:283:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):540:543 -> a
     280:283:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):471 -> a
     280:283:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):440 -> a
     284:284:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):471:471 -> a
@@ -31366,7 +31497,7 @@
     1:1:int size():137:137 -> size
     1:1:java.util.stream.Stream stream():141:141 -> stream
     1:8:java.lang.String toString():146:153 -> toString
-com.android.tools.r8.graph.DexTypeUtils -> com.android.tools.r8.internal.Lh:
+com.android.tools.r8.graph.DexTypeUtils -> com.android.tools.r8.internal.Ph:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:3:com.android.tools.r8.graph.DexType computeLeastUpperBound(com.android.tools.r8.graph.AppView,java.lang.Iterable):16:18 -> a
@@ -31375,11 +31506,11 @@
     13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.toArrayType(int,com.android.tools.r8.graph.DexItemFactory):471:471 -> a
     13:13:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):30 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):536:536 -> a
+    14:14:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):540:540 -> a
     14:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.toArrayType(int,com.android.tools.r8.graph.DexItemFactory):471 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):30 -> a
-    15:18:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):536:539 -> a
+    15:18:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):540:543 -> a
     15:18:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.toArrayType(int,com.android.tools.r8.graph.DexItemFactory):471 -> a
     15:18:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):30 -> a
     19:19:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.toArrayType(int,com.android.tools.r8.graph.DexItemFactory):471:471 -> a
@@ -31411,7 +31542,6 @@
     boolean isNestedDexValue() -> S0
     boolean mayHaveSideEffects() -> T0
     void sort() -> U0
-    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) -> a
     void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection) -> a
     com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory) -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory) -> a
@@ -31472,9 +31602,8 @@
     1:1:com.android.tools.r8.graph.IndexedDexItem getValue():1274 -> W0
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):1309:1309 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1338:1338 -> a
-    3: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):1344:1346 -> a
-    6:6:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1355:1355 -> a
-    7:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1360:1360 -> a
+    3:3:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1355:1355 -> a
+    4:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1360:1360 -> a
     1:4:int compareAndCheckValueStrings(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1279:1282 -> b
     1:4:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1300 -> b
     5:5:boolean com.android.tools.r8.graph.DexValue.isDexItemBasedValueString():0:0 -> b
@@ -31557,7 +31686,6 @@
     1:1:com.android.tools.r8.graph.DexValue$DexValueBoolean create(boolean):1883:1883 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1907:1907 -> a
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1932:1932 -> 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):1961:1961 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1888:1888 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1893:1893 -> b
     1:1:boolean equals(java.lang.Object):1950:1950 -> equals
@@ -31580,7 +31708,6 @@
     3:4:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):529:530 -> a
     5:5:int com.android.tools.r8.dex.DexOutputBuffer.putSignedEncodedValue(long,int):87:87 -> a
     5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):530 -> a
-    6:6: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):559:559 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):485:485 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):490:490 -> b
     1:1:boolean equals(java.lang.Object):548:548 -> equals
@@ -31611,7 +31738,6 @@
     6:6:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):154:154 -> a
     6:6:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):716 -> a
     7:8:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):717:718 -> 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):747:747 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):670:670 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):675:675 -> b
     1:1:boolean equals(java.lang.Object):736:736 -> equals
@@ -31640,9 +31766,6 @@
     5:5:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):154:154 -> a
     5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1094 -> a
     6:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1095:1096 -> 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):1107:1107 -> 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):1191:1191 -> 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):1107 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1048:1048 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1053:1053 -> b
     1:2:boolean equals(java.lang.Object):1120:1121 -> equals
@@ -31703,9 +31826,6 @@
     5:5:void com.android.tools.r8.dex.DexOutputBuffer.rewind(int):154:154 -> a
     5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):996 -> a
     6:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):997:998 -> 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):1009:1009 -> 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):1195:1195 -> 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):1009 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):950:950 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):955:955 -> b
     1:2:boolean equals(java.lang.Object):1022:1023 -> equals
@@ -31730,7 +31850,6 @@
     1:1:int getValue():775:775 -> W0
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):785:785 -> a
     2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):800:800 -> 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):839:839 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):766:766 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):771:771 -> b
     1:1:boolean equals(java.lang.Object):828:828 -> equals
@@ -31779,9 +31898,6 @@
     1:1:com.android.tools.r8.graph.DexValue$DexValueLong create(long):853:853 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):877:877 -> a
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):902:902 -> 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):931:931 -> 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):1207:1207 -> 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):931 -> a
     1:1:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):858:858 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):863:863 -> b
     1:1:boolean equals(java.lang.Object):920:920 -> equals
@@ -31810,7 +31926,7 @@
     4:4:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     4:4:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     4:4:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):1472 -> a
-    5:5:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    5:5:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     5:5:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193 -> a
     5:5:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     5:5:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):1472 -> a
@@ -31858,9 +31974,6 @@
     long getRawValue() -> V0
     1:1:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1811:1811 -> a
     2:2:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1821:1821 -> 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):1865:1865 -> a
-    4:4:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):1242:1242 -> 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):1865 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1790:1790 -> b
     2:3:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1795:1796 -> b
     1:1:boolean equals(java.lang.Object):1854:1854 -> equals
@@ -31904,7 +32017,6 @@
     1:1:com.android.tools.r8.graph.DexValue$DexValueShort create(short):573:573 -> a
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):597:597 -> a
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):622:622 -> 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):651:651 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):578:578 -> b
     2:2:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):583:583 -> b
     1:1:boolean equals(java.lang.Object):640:640 -> equals
@@ -31926,13 +32038,12 @@
     1:1:com.android.tools.r8.graph.IndexedDexItem com.android.tools.r8.graph.DexValue$NestedDexValue.getValue():1149:1149 -> V0
     1:1:com.android.tools.r8.graph.IndexedDexItem getValue():1200 -> V0
     1:1:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):1222:1222 -> a
-    2:2:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    2:2:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):1222 -> a
     3:3:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1247:1247 -> a
-    4:7: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):1253:1256 -> a
-    8:8:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1270:1270 -> a
+    4:4:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1270:1270 -> a
     1:1:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1208:1208 -> b
-    2:2:void com.android.tools.r8.graph.DexString.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):70:70 -> b
+    2:2:void com.android.tools.r8.graph.DexString.acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):74:74 -> b
     2:2:void internalAcceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):1208 -> b
     3:4:int com.android.tools.r8.graph.DexValue$DexItemBasedValueString.compareAndCheckValueStrings(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1279:1280 -> b
     3:4:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1213 -> b
@@ -31947,7 +32058,7 @@
     8:8:int com.android.tools.r8.graph.DexValue$DexItemBasedValueString.compareAndCheckValueStrings(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1283:1283 -> b
     8:8:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1213 -> b
     9:9:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1217:1217 -> b
-    10:10:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> b
+    10:10:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):69:69 -> b
     10:10:int internalAcceptCompareTo(com.android.tools.r8.graph.DexValue,com.android.tools.r8.utils.structural.CompareToVisitor):1217 -> b
     1:1:java.lang.Object asAsmEncodedObject():1237:1237 -> l0
 com.android.tools.r8.graph.DexValue$DexValueType -> com.android.tools.r8.graph.h1$k:
@@ -31972,7 +32083,7 @@
     6:6:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):1388 -> a
     7:7:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     7:7:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):1388 -> a
-    8:8:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    8:8:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     8:8:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     8:8:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):1388 -> a
     9:9:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):1403:1403 -> a
@@ -32050,7 +32161,7 @@
     int[] $SwitchMap$com$android$tools$r8$graph$DexWritableCode$DexWritableCodeKind -> b
     boolean $assertionsDisabled -> a
     1:9:void <clinit>():37:45 -> <clinit>
-com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind -> com.android.tools.r8.internal.Ph:
+com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind -> com.android.tools.r8.internal.Th:
     com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind THROW_EXCEPTION -> e
     com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind THROW_NULL -> d
     com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind[] $VALUES -> f
@@ -32126,10 +32237,10 @@
     1:1:java.util.Collection classpathClasses():61:61 -> k
     1:1:java.util.Collection libraryClasses():80:80 -> l
     1:4:boolean verifyCodeObjectsOwners():193:196 -> m
-    5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):241:241 -> m
+    5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):246:246 -> m
     5:5:boolean verifyCodeObjectsOwners():196 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):241:241 -> m
+    6:6:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):246:246 -> m
     6:6:boolean verifyCodeObjectsOwners():196 -> m
     7:17:boolean verifyCodeObjectsOwners():196:206 -> m
     1:1:java.lang.String toString():149:149 -> toString
@@ -32190,7 +32301,7 @@
     109:109:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):86 -> a
     110:110:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     110:110:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):86 -> a
-    111:111:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    111:111:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     111:111:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     111:111:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):86 -> a
     104:104:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):88:88 -> a
@@ -32200,7 +32311,7 @@
     106:106:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     106:106:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     106:106:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):89 -> a
-    107:107:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    107:107:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     107:107:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193 -> a
     107:107:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     107:107:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):89 -> a
@@ -32261,9 +32372,9 @@
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase setStatic():140 -> d
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():373:374 -> e
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase setSynthetic():140 -> e
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.ik:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.jk:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.kk:
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.nk:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.ok:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.pk:
     java.util.Map infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -32285,7 +32396,7 @@
     2:2:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):50:50 -> b
     1:1:void remove(com.android.tools.r8.graph.DexField):67:67 -> c
     2:2:boolean verifyMappingIsOneToOne():99:99 -> c
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.lk:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.qk:
     com.android.tools.r8.graph.AbstractAccessContexts readsWithContexts -> c
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> e
@@ -32563,7 +32674,7 @@
     1:1:void <clinit>():493:493 -> <clinit>
     1:1:void <init>():491:491 -> <init>
     1:1:com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult access$100():491:491 -> A
-com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.dl:
+com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.il:
     java.util.Map mapping -> a
     1:2:void <init>(java.util.Map):14:15 -> <init>
     1:1: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):0:0 -> a
@@ -32905,12 +33016,12 @@
     1:3:void <init>(java.util.Map,java.util.Map):129:131 -> <init>
     1:1:com.android.tools.r8.graph.GenericSignatureContextBuilder create(com.android.tools.r8.graph.AppView):135:135 -> a
     2:2:com.android.tools.r8.graph.GenericSignatureContextBuilder create(com.android.tools.r8.graph.AppView,java.util.Collection):140:140 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.parseSignatureAttribute():689:689 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.parseSignatureAttribute():694:694 -> a
     3:3:com.android.tools.r8.graph.GenericSignatureContextBuilder create(com.android.tools.r8.graph.AppView,java.util.Collection):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:41:com.android.tools.r8.graph.GenericSignatureContextBuilder create(com.android.tools.r8.graph.AppView,java.util.Collection):143:180 -> a
     42:42:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):149:149 -> a
-    43:43:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():702:702 -> a
+    43:43:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():716:716 -> a
     43:43:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):151 -> a
     44:44:void lambda$create$1(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexProgramClass):151:151 -> a
     45:45:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
@@ -32926,7 +33037,7 @@
     82:82:void lambda$create$0(java.util.Map,com.android.tools.r8.graph.ProgramMethod):158:158 -> a
     83:84:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate):203:204 -> a
     85:89:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):213:217 -> a
-    90:90:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    90:90:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     90:90:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):222 -> a
     91:99:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):223:231 -> a
     100:100:java.util.List com.android.tools.r8.graph.GenericSignature$ClassSignature.getFormalTypeParameters():258:258 -> a
@@ -32940,7 +33051,7 @@
     119:120:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext.access$100(com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterSubstitutions,boolean):55 -> a
     119:120:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):241 -> a
     121:126:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):242:247 -> a
-    127:127:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):610:610 -> a
+    127:127:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):624:624 -> a
     127:127:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):247 -> a
     128:129:com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext computeTypeParameterContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,java.util.function.Predicate,boolean):250:251 -> a
     130:130:java.util.List com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.getFormalTypeParameters():874:874 -> a
@@ -33016,7 +33127,7 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GenericSignatureContextBuilder,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode):93:97 -> <init>
     1:1:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper createForInitialCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GenericSignatureContextBuilder):102:102 -> a
     2:3:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult run(java.util.Collection):111:112 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.parseSignatureAttribute():689:689 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.parseSignatureAttribute():694:694 -> a
     4:4:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult run(java.util.Collection):112 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:9:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult run(java.util.Collection):113:117 -> a
@@ -33024,21 +33135,21 @@
     10:10:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult run(java.util.Collection):117 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:12:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):123:124 -> a
-    13:13:boolean com.android.tools.r8.utils.InternalOptions.parseSignatureAttribute():689:689 -> a
+    13:13:boolean com.android.tools.r8.utils.InternalOptions.parseSignatureAttribute():694:694 -> a
     13:13:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):124 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:29:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):125:140 -> a
-    30:30:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    30:30:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     30:30:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    31:31:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    31:31:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     31:31:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):140 -> a
     32:41:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):140:149 -> a
-    42:42:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    42:42:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     42:42:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):150 -> a
     43:43:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):147:147 -> a
     44:44:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):146:146 -> a
-    45:45:void com.android.tools.r8.graph.DexClass.clearClassSignature():1069:1069 -> a
+    45:45:void com.android.tools.r8.graph.DexClass.clearClassSignature():1083:1083 -> a
     45:45:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):153 -> a
     46:50:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):155:159 -> a
     51:51:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):158:158 -> a
@@ -33052,26 +33163,26 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     60:60:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult lambda$evaluateSignaturesForClass$0(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):161:161 -> a
     61:62:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):166:167 -> a
-    63:63:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    63:63:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     63:63:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):167 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    64:64:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    64:64:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     64:64:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):167 -> a
     65:75:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):167:177 -> a
-    76:76:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    76:76:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     76:76:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):178 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     77:77:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):175:175 -> a
     78:85:void lambda$evaluateSignaturesForClass$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):174:181 -> a
     86:86:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult lambda$evaluateSignaturesForClass$2(com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$GenericSignatureContextEvaluator,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):190:190 -> a
     87:90:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):193:196 -> a
-    91:91:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    91:91:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     91:91:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):196 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    92:92:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    92:92:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     92:92:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):196 -> a
     93:102:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):196:205 -> a
-    103:103:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    103:103:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     103:103:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):206 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     104:104:void lambda$evaluateSignaturesForClass$3(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult):203:203 -> a
@@ -33231,7 +33342,7 @@
     191:191:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):428 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     192:195:com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$SignatureEvaluationResult evaluateTypeArgumentsAppliedToType(java.util.List,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.GenericSignatureContextBuilder$TypeParameterContext):428:431 -> a
-com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Im:
+com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Nm:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.graph.GenericSignatureCorrectnessHelper$Mode.clearIfInvalid() -> a
@@ -33580,97 +33691,96 @@
     com.android.tools.r8.graph.GraphLens$FieldLookupResult lambda$lookupFieldResult$0(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> 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,com.android.tools.r8.graph.GraphLens) -> a
     java.lang.String lookupPackageName(java.lang.String) -> a
-    1:1:com.android.tools.r8.graph.DexMember getOriginalMemberSignature(com.android.tools.r8.graph.DexMember):313:313 -> a
-    2:2:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    3:8:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):323:328 -> a
-    9:9:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):333:333 -> a
-    9:9:void lambda$rewriteFieldKeys$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):726 -> a
-    10:10:void lambda$rewriteFieldKeys$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):726:726 -> a
-    11:19: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):359:367 -> a
-    11:19:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):352 -> a
-    20:20:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):610:610 -> a
-    20:20: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):368 -> a
+    1:1:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    2:7:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):323:328 -> a
+    8:8:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):333:333 -> a
+    8:8:void lambda$rewriteFieldKeys$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):726 -> a
+    9:9:void lambda$rewriteFieldKeys$8(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):726:726 -> a
+    10:18:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):359:367 -> a
+    10:18:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):352 -> a
+    19:19:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):624:624 -> a
+    19:19: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):368 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    19:19:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):352 -> a
+    20:20:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):624:624 -> a
+    20:20: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):368 -> a
     20:20:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):352 -> a
-    21:21:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):610:610 -> a
-    21:21: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):368 -> a
+    21:21: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):369:369 -> a
     21:21:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):352 -> a
-    22:22: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):369:369 -> a
-    22:22:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):352 -> a
-    23:23:boolean isSimpleRenaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):385:385 -> a
-    24:24:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    24:24:void lambda$rewriteTypeKeys$9(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):742 -> a
-    25:27:void lambda$rewriteTypeKeys$9(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):743:745 -> a
-    28:28:void lambda$rewriteTypeKeys$9(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):744:744 -> a
-    29:29:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):524:524 -> a
-    30:35:boolean assertDefinitionsNotModified(java.lang.Iterable):611:616 -> a
-    36:39:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):623:626 -> a
-    40:43:boolean assertReferencesNotModified(java.lang.Iterable):631:634 -> a
-    40:43:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
-    44:44:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):333:333 -> a
-    44:44:boolean assertReferencesNotModified(java.lang.Iterable):634 -> a
-    44:44:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
-    45:48:boolean assertReferencesNotModified(java.lang.Iterable):634:637 -> a
-    45:48:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
-    49:49:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):345:345 -> a
-    49:49:boolean assertReferencesNotModified(java.lang.Iterable):637 -> a
-    49:49:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
-    50:52:boolean assertReferencesNotModified(java.lang.Iterable):637:639 -> a
-    50:52:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
-    53:53:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    53:53:boolean assertReferencesNotModified(java.lang.Iterable):639 -> a
-    53:53:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
-    54:55:boolean assertReferencesNotModified(java.lang.Iterable):639:640 -> a
-    54:55:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
-    56:56:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    56:56:boolean assertReferencesNotModified(java.lang.Iterable):641 -> a
+    22:22:boolean isSimpleRenaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference):385:385 -> a
+    23:23:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    23:23:void lambda$rewriteTypeKeys$9(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):742 -> a
+    24:26:void lambda$rewriteTypeKeys$9(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):743:745 -> a
+    27:27:void lambda$rewriteTypeKeys$9(java.util.Map,java.util.function.BiFunction,com.android.tools.r8.graph.DexType,java.lang.Object):744:744 -> a
+    28:28:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):524:524 -> a
+    29:34:boolean assertDefinitionsNotModified(java.lang.Iterable):611:616 -> a
+    35:38:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):623:626 -> a
+    39:42:boolean assertReferencesNotModified(java.lang.Iterable):631:634 -> a
+    39:42:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
+    43:43:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):333:333 -> a
+    43:43:boolean assertReferencesNotModified(java.lang.Iterable):634 -> a
+    43:43:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
+    44:47:boolean assertReferencesNotModified(java.lang.Iterable):634:637 -> a
+    44:47:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
+    48:48:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):345:345 -> a
+    48:48:boolean assertReferencesNotModified(java.lang.Iterable):637 -> a
+    48:48:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
+    49:51:boolean assertReferencesNotModified(java.lang.Iterable):637:639 -> a
+    49:51:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
+    52:52:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    52:52:boolean assertReferencesNotModified(java.lang.Iterable):639 -> a
+    52:52:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
+    53:54:boolean assertReferencesNotModified(java.lang.Iterable):639:640 -> a
+    53:54:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
+    55:55:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    55:55:boolean assertReferencesNotModified(java.lang.Iterable):641 -> a
+    55:55:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
+    56:56:boolean assertReferencesNotModified(java.lang.Iterable):641:641 -> a
     56:56:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
-    57:57:boolean assertReferencesNotModified(java.lang.Iterable):641:641 -> a
-    57:57:boolean assertPinnedNotModified(com.android.tools.r8.shaking.KeepInfoCollection,com.android.tools.r8.utils.InternalOptions):627 -> a
-    58:60:java.util.Map rewriteCallSites(java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier):649:651 -> a
-    61:65: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):653:657 -> a
-    66:66:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteCallSites$1(com.android.tools.r8.graph.DexCallSite):656:656 -> a
-    67:67:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):665:665 -> a
-    67:67:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):691 -> a
-    68:72:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):692:696 -> a
-    73:75:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newArrayList(java.lang.Object,java.lang.Object):194:196 -> a
-    73:75:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):700 -> a
-    76:77:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):700:701 -> a
-    78:79:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.GraphLens):670:671 -> a
-    80:80:com.android.tools.r8.graph.DexReference lambda$rewriteReference$3(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):672:672 -> a
-    81:82:java.util.Set rewriteReferences(java.util.Set):678:679 -> a
-    83:83:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):665:665 -> a
-    83:83:java.util.Set rewriteReferences(java.util.Set):680 -> a
-    84:84:java.util.Set rewriteReferences(java.util.Set):680:680 -> a
-    85:103:java.util.Map rewriteReferenceKeys(java.util.Map,java.util.function.BiFunction):687:705 -> a
-    104:106:void lambda$rewriteReferenceKeys$7(java.util.function.BiFunction,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):707:709 -> a
-    107:109:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):725:727 -> a
-    110:111:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):731:732 -> a
-    112:112:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    112:112:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):733 -> a
-    113:115:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):733:735 -> a
-    116:132:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):752:768 -> a
-    133:133:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404:404 -> a
+    57:59:java.util.Map rewriteCallSites(java.util.Map,com.android.tools.r8.graph.DexDefinitionSupplier):649:651 -> a
+    60:64: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):653:657 -> a
+    65:65:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteCallSites$1(com.android.tools.r8.graph.DexCallSite):656:656 -> a
+    66:66:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):665:665 -> a
+    66:66:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):691 -> a
+    67:71:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):692:696 -> a
+    72:74:java.util.ArrayList com.android.tools.r8.utils.ListUtils.newArrayList(java.lang.Object,java.lang.Object):194:196 -> a
+    72:74:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):700 -> a
+    75:76:void lambda$rewriteReferenceKeys$6(java.util.Map,java.util.Map,com.android.tools.r8.graph.DexReference,java.lang.Object):700:701 -> a
+    77:78:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.GraphLens):670:671 -> a
+    79:79:com.android.tools.r8.graph.DexReference lambda$rewriteReference$3(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexType):672:672 -> a
+    80:81:java.util.Set rewriteReferences(java.util.Set):678:679 -> a
+    82:82:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):665:665 -> a
+    82:82:java.util.Set rewriteReferences(java.util.Set):680 -> a
+    83:83:java.util.Set rewriteReferences(java.util.Set):680:680 -> a
+    84:102:java.util.Map rewriteReferenceKeys(java.util.Map,java.util.function.BiFunction):687:705 -> a
+    103:105:void lambda$rewriteReferenceKeys$7(java.util.function.BiFunction,java.util.Map,com.android.tools.r8.graph.DexReference,java.util.List):707:709 -> a
+    106:108:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):725:727 -> a
+    109:110:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):731:732 -> a
+    111:111:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    111:111:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):733 -> a
+    112:114:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):733:735 -> a
+    115:131:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):752:768 -> a
+    132:132:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404:404 -> a
+    132:132:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):768 -> a
+    133:133:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):400:400 -> a
+    133:133:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404 -> a
     133:133:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):768 -> a
-    134:134:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):400:400 -> a
-    134:134:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404 -> a
-    134:134:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):768 -> a
-    135:141:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):771:777 -> a
-    142:142:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1725,"2":1726,"3":1727}}
+    134:140:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):771:777 -> a
+    141:141:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1724,"2":1725,"3":1726}}
+    1724:1724:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):777:777 -> a
     1725:1725:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):777:777 -> a
     1726:1726:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):777:777 -> a
-    1727:1727:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):777:777 -> a
-    921:929:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):779:787 -> a
-    930:930:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    930:930:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):787 -> a
-    931:931:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):788:788 -> a
-    932:932:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1738,"2":1739,"3":1740}}
+    920:928:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):779:787 -> a
+    929:929:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    929:929:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):787 -> a
+    930:930:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):788:788 -> a
+    931:931:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1737,"2":1738,"3":1739}}
+    1737:1737:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):788:788 -> a
     1738:1738:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):788:788 -> a
     1739:1739:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):788:788 -> a
-    1740:1740:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):788:788 -> a
-    1722:1724:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):790:792 -> a
+    1721:1723:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):790:792 -> a
     com.android.tools.r8.optimize.MemberRebindingLens asMemberRebindingLens() -> b
     java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType) -> b
     com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens) -> b
@@ -33699,7 +33809,7 @@
     boolean isEnumUnboxerLens() -> h
     boolean isIdentityLens() -> i
     boolean isNonIdentityLens() -> j
-com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.internal.Rm:
+com.android.tools.r8.graph.GraphLens$Builder -> com.android.tools.r8.internal.Wm:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap methodMap -> b
     java.util.Map typeMap -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap fieldMap -> a
@@ -33899,7 +34009,7 @@
     boolean isNonIdentityLens() -> j
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():816:816 -> k
     1:1:com.android.tools.r8.graph.GraphLens getPrevious():820:820 -> l
-com.android.tools.r8.graph.ImmediateProgramSubtypingInfo -> com.android.tools.r8.internal.Lo:
+com.android.tools.r8.graph.ImmediateProgramSubtypingInfo -> com.android.tools.r8.internal.Qo:
     java.util.Map immediateSubtypes -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):28:30 -> <init>
@@ -33924,20 +34034,20 @@
     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.hq:
+com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.mq:
     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.ThrowingInitClassLens getThrowingInstance():17:17 -> b
-com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.gq:
+com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.lq:
     java.util.Map mapping -> a
     boolean $assertionsDisabled -> b
     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.Eq:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.Jq:
     com.android.tools.r8.graph.DexString innerName -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType outer -> c
@@ -33961,7 +34071,7 @@
     210:210:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):91 -> a
     211:211:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     211:211:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):91 -> a
-    212:212:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    212:212:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     212:212:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     212:212:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):91 -> a
     108:109:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):92:93 -> a
@@ -33975,11 +34085,11 @@
     214:214:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):93 -> a
     215:215:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     215:215:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):93 -> a
-    216:216:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    216:216:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     216:216:void com.android.tools.r8.graph.DexType.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):243 -> a
     216:216:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):93 -> a
     206:207:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):95:96 -> a
-    208:208:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    208:208:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     208:208:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):96 -> 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
@@ -33997,7 +34107,7 @@
     258:258:java.lang.String toString():127:127 -> toString
     259:259:java.lang.String toString():127:127 -> toString
     260:260:java.lang.String toString():127:127 -> toString
-com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.er:
+com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.jr:
     void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer) -> a
 com.android.tools.r8.graph.InvalidCode -> com.android.tools.r8.graph.r2:
     com.android.tools.r8.graph.InvalidCode INSTANCE -> d
@@ -34013,7 +34123,7 @@
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():61:61 -> p0
     1:1:java.lang.String toString():47:47 -> toString
     1:1:com.android.tools.r8.graph.Code getInstance():17:17 -> z0
-com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.internal.Sw:
+com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.internal.Yw:
     com.android.tools.r8.graph.ApplicationReaderMap applicationReaderMap -> e
     java.util.concurrent.ConcurrentHashMap stringCache -> d
     com.android.tools.r8.utils.InternalOptions options -> a
@@ -34219,251 +34329,249 @@
     com.android.tools.r8.graph.DexType superType -> l
     com.android.tools.r8.graph.DexType type -> j
     java.util.List nestMembers -> p
-    java.util.Set fieldSignatures -> y
     boolean deprecated -> i
-    com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMember -> r
-    java.util.List defaultAnnotations -> v
-    java.util.List directMethods -> z
-    java.util.List instanceFields -> x
+    java.util.List annotations -> v
+    java.util.List innerClasses -> t
+    java.util.List staticFields -> x
     com.android.tools.r8.cf.CfVersion version -> h
-    com.android.tools.r8.graph.GenericSignature$ClassSignature classSignature -> t
-    java.util.List virtualMethods -> A
+    java.util.List directMethods -> A
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.graph.NestHostClassAttribute nestHost -> o
-    boolean $assertionsDisabled -> E
     java.util.function.Consumer classConsumer -> f
-    java.util.Set recordComponents -> q
     com.android.tools.r8.graph.DexTypeList interfaces -> m
-    com.android.tools.r8.synthesis.SyntheticMarker syntheticMarker -> D
     com.android.tools.r8.graph.JarClassFileReader$ReparseContext context -> g
     com.android.tools.r8.graph.DexString sourceFile -> n
-    boolean hasReachabilitySensitiveMethod -> C
-    java.util.List annotations -> u
+    java.util.List permittedSubclasses -> q
+    java.util.Set fieldSignatures -> z
     com.android.tools.r8.graph.ClassAccessFlags accessFlags -> k
-    java.util.List innerClasses -> s
-    java.util.List staticFields -> w
-    java.util.Set methodSignatures -> B
+    com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMember -> s
+    java.util.List instanceFields -> y
+    java.util.List defaultAnnotations -> w
+    com.android.tools.r8.graph.GenericSignature$ClassSignature classSignature -> u
+    java.util.List virtualMethods -> B
     com.android.tools.r8.graph.JarApplicationReader application -> e
+    java.util.Set methodSignatures -> C
+    com.android.tools.r8.synthesis.SyntheticMarker syntheticMarker -> E
+    boolean $assertionsDisabled -> F
+    java.util.Set recordComponents -> r
+    boolean hasReachabilitySensitiveMethod -> D
     1:1:void <clinit>():211:211 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):250:250 -> <init>
-    2:40:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):217:255 -> <init>
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):251:251 -> <init>
+    2:41:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.ClassKind,byte[],com.android.tools.r8.graph.JarApplicationReader,java.util.function.Consumer):217:256 -> <init>
     long lambda$getChecksumSupplier$0(long,com.android.tools.r8.graph.DexProgramClass) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     1:1:com.android.tools.r8.graph.JarClassFileReader$ReparseContext access$1000(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):211:211 -> a
     2:2:boolean access$1376(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,int):211:211 -> a
-    3:6:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):260:263 -> a
-    7:9:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):270:272 -> a
+    3:6:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):261:264 -> a
+    7:9:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):271:273 -> a
     10:10:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":848,"2":849,"3":850,"4":851,"5":852}}
-    848:848:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    849:849:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    850:850:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    851:851:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    852:852:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    282:282:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    283:283:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":853,"2":854,"3":855,"4":856,"5":857}}
-    853:853:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    854:854:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    855:855:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    856:856:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    857:857:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    555:555:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    556:556:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":858,"2":859,"3":860,"4":861,"5":862}}
-    858:858:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    859:859:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    860:860:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    861:861:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    862:862:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    828:831:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):272:272 -> a
-    841:847:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):282:282 -> a
-    863:868:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):293:298 -> a
-    869:870:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):297:298 -> a
-    871:873:void visitNestHost(java.lang.String):303:305 -> a
-    874:874:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):328:328 -> a
-    875:875:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":880,"2":881,"3":882}}
-    880:880:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):316:316 -> a
-    880:880:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):328 -> a
-    881:881:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):316:316 -> a
-    881:881:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):328 -> a
-    882:882:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):316:316 -> a
-    882:882:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):328 -> a
-    876:876:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):317:317 -> a
-    876:876:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):328 -> a
-    877:877:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):328:328 -> a
-    878:878:java.lang.String illegalClassFilePostfix(com.android.tools.r8.cf.CfVersion):323:323 -> a
-    878:878:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):330 -> a
-    879:879:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):330:330 -> a
-    883:903:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):366:386 -> a
-    904:904:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    904:904:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    904:904:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):386 -> a
-    905:909:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):386:390 -> a
-    910:910:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":851,"2":852,"3":853,"4":854,"5":855}}
+    851:851:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    852:852:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    853:853:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    854:854:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    855:855:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    283:283:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    284:284:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":856,"2":857,"3":858,"4":859,"5":860}}
+    856:856:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    857:857:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    858:858:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    859:859:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    860:860:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    557:557:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    558:558:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":861,"2":862,"3":863,"4":864,"5":865}}
+    861:861:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    862:862:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    863:863:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    864:864:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    865:865:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    831:834:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):273:273 -> a
+    844:850:void visitInnerClass(java.lang.String,java.lang.String,java.lang.String,int):283:283 -> a
+    866:871:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):294:299 -> a
+    872:873:void visitOuterClass(java.lang.String,java.lang.String,java.lang.String):298:299 -> a
+    874:876:void visitNestHost(java.lang.String):304:306 -> a
+    877:877:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):329:329 -> a
+    878:878:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":883,"2":884,"3":885}}
+    883:883:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):317:317 -> a
+    883:883:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):329 -> a
+    884:884:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):317:317 -> a
+    884:884:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):329 -> a
+    885:885:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):317:317 -> a
+    885:885:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):329 -> a
+    879:879:java.lang.String illegalClassFilePrefix(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String):318:318 -> a
+    879:879:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):329 -> a
+    880:880:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):329:329 -> a
+    881:881:java.lang.String illegalClassFilePostfix(com.android.tools.r8.cf.CfVersion):324:324 -> a
+    881:881:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):331 -> a
+    882:882:java.lang.String illegalClassFileMessage(com.android.tools.r8.graph.ClassAccessFlags,java.lang.String,com.android.tools.r8.cf.CfVersion,java.lang.String):331:331 -> a
+    886:906:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):365:385 -> a
+    907:907:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    907:907:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    907:907:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):385 -> a
+    908:912:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):385:389 -> a
+    913:913:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2109,"2":2110,"3":2111,"4":2112,"5":2113}}
-    2109:2109:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390:390 -> a
-    2110:2110:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390:390 -> a
-    2111:2111:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390:390 -> a
-    2112:2112:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390:390 -> a
-    2113:2113:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390:390 -> a
-    1301:1301:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):391:391 -> a
-    1302:1302:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    1302:1302:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    1302:1302:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):391 -> a
-    1303:1313:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):391:401 -> a
-    1314:1321:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):68:75 -> a
-    1314:1321:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):401 -> a
-    1322:1323:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):401:402 -> a
-    1324:1324:boolean com.android.tools.r8.utils.InternalOptions.parseSignatureAttribute():689:689 -> a
-    1324:1324:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):402 -> a
+    2109:2109:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):389:389 -> a
+    2110:2110:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):389:389 -> a
+    2111:2111:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):389:389 -> a
+    2112:2112:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):389:389 -> a
+    2113:2113:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):389:389 -> a
+    1303:1303:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390:390 -> a
+    1304:1304:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    1304:1304:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    1304:1304:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390 -> a
+    1305:1315:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):390:400 -> a
+    1316:1323:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.JarApplicationReader.getTypeListFromNames(java.lang.String[]):68:75 -> a
+    1316:1323:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):400 -> a
+    1324:1325:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):400:401 -> a
+    1326:1326:boolean com.android.tools.r8.utils.InternalOptions.parseSignatureAttribute():694:694 -> a
+    1326:1326:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):401 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1325:1325:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):403:403 -> a
-    1326:1326:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    1326:1326:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):405 -> a
+    1327:1327:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):402:402 -> a
+    1328:1328:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    1328:1328:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):404 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1327:1327:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    1327:1327:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):405 -> a
-    1328:1328:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):405:405 -> a
-    1329:1329:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):404:404 -> a
-    1330:1330:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:376 -> a
-    1331:1331:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
+    1329:1329:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    1329:1329:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):404 -> a
+    1330:1330:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):404:404 -> a
+    1331:1331:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):403:403 -> a
+    1332:1332:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
+    1333:1333:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2114,"2":2115,"3":2116}}
-    2114:2114:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:376 -> a
-    2115:2115:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:376 -> a
-    2116:2116:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:376 -> a
-    1707:1712:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:381 -> a
-    1713:1713:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):377:377 -> a
-    1714:1714:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    1714:1714:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    1714:1714:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):377 -> a
-    1715:1715:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):377:377 -> a
-    1716:1716:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):368:368 -> a
-    1717:1717:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
+    2114:2114:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
+    2115:2115:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
+    2116:2116:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:375 -> a
+    1708:1713:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):375:380 -> a
+    1714:1714:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:376 -> a
+    1715:1715:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    1715:1715:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    1715:1715:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376 -> a
+    1716:1716:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):376:376 -> a
+    1717:1717:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):367:367 -> a
+    1718:1718:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2117,"2":2118,"3":2119}}
-    2117:2117:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):368:368 -> a
-    2118:2118:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):368:368 -> a
-    2119:2119:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):368:368 -> a
-    2085:2085:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):368:368 -> a
+    2117:2117:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):367:367 -> a
+    2118:2118:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):367:367 -> a
+    2119:2119:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):367:367 -> a
+    2085:2085:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):367:367 -> a
     2086:2086:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     2086:2086:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    2086:2086:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):368 -> a
-    2087:2087:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):368:368 -> a
-    2120:2120:void visitSource(java.lang.String,java.lang.String):412:412 -> a
+    2086:2086:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):367 -> a
+    2087:2087:void visit(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):367:367 -> a
+    2120:2120:void visitSource(java.lang.String,java.lang.String):411:411 -> a
     2121:2124:java.util.List getAnnotations():610:613 -> a
-    2121:2124:void visitSource(java.lang.String,java.lang.String):415 -> a
-    2125:2127:void visitSource(java.lang.String,java.lang.String):415:417 -> a
+    2121:2124:void visitSource(java.lang.String,java.lang.String):414 -> a
+    2125:2127:void visitSource(java.lang.String,java.lang.String):414:416 -> a
     2128:2128:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    2128:2128:void visitSource(java.lang.String,java.lang.String):417 -> a
+    2128:2128:void visitSource(java.lang.String,java.lang.String):416 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2129:2129:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    2129:2129:void visitSource(java.lang.String,java.lang.String):417 -> a
-    2130:2133: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):271:274 -> a
-    2130:2133:void visitSource(java.lang.String,java.lang.String):416 -> a
-    2134:2134:void visitSource(java.lang.String,java.lang.String):415:415 -> a
-    2135:2143:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):424:432 -> a
-    2144:2151:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):438:445 -> a
-    2152:2153:void visitEnd():462:463 -> a
+    2129:2129:void visitSource(java.lang.String,java.lang.String):416 -> a
+    2130:2133: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):286:289 -> a
+    2130:2133:void visitSource(java.lang.String,java.lang.String):415 -> a
+    2134:2134:void visitSource(java.lang.String,java.lang.String):414:414 -> a
+    2135:2143:com.android.tools.r8.org.objectweb.asm.FieldVisitor visitField(int,java.lang.String,java.lang.String,java.lang.String,java.lang.Object):423:431 -> a
+    2144:2151:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):437:444 -> a
+    2152:2153:void visitEnd():461:462 -> a
     2154:2154:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    2154:2154:void visitEnd():464 -> a
+    2154:2154:void visitEnd():463 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2155:2155:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    2155:2155:void visitEnd():464 -> a
-    2156:2156:void visitEnd():463:463 -> a
+    2155:2155:void visitEnd():463 -> a
+    2156:2156:void visitEnd():462:462 -> a
     2157:2160:java.util.List getAnnotations():610:613 -> a
     2157:2160:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):606 -> a
-    2157:2160:void visitEnd():463 -> a
+    2157:2160:void visitEnd():462 -> a
     2161:2161:void addAnnotation(com.android.tools.r8.graph.DexAnnotation):606:606 -> a
-    2161:2161:void visitEnd():463 -> a
+    2161:2161:void visitEnd():462 -> a
     2162:2162:void checkReachabilitySensitivity():576:576 -> a
-    2162:2162:void visitEnd():466 -> a
+    2162:2162:void visitEnd():465 -> a
     2163:2163:boolean hasReachabilitySensitiveField():587:587 -> a
     2163:2163:void checkReachabilitySensitivity():576 -> a
-    2163:2163:void visitEnd():466 -> a
+    2163:2163:void visitEnd():465 -> a
     2164:2164:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
     2164:2164:boolean hasReachabilitySensitiveField():587 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2164:2164:void checkReachabilitySensitivity():576 -> a
-    2164:2164:void visitEnd():466 -> a
+    2164:2164:void visitEnd():465 -> a
     2165:2165:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
     2165:2165:boolean hasReachabilitySensitiveField():587 -> a
     2165:2165:void checkReachabilitySensitivity():576 -> a
-    2165:2165:void visitEnd():466 -> a
+    2165:2165:void visitEnd():465 -> a
     2166:2167:boolean hasReachabilitySensitiveField():587:588 -> a
     2166:2167:void checkReachabilitySensitivity():576 -> a
-    2166:2167:void visitEnd():466 -> a
+    2166:2167:void visitEnd():465 -> a
     2168:2168:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
     2168:2168:boolean hasReachabilitySensitiveField():588 -> a
     2168:2168:void checkReachabilitySensitivity():576 -> a
-    2168:2168:void visitEnd():466 -> a
+    2168:2168:void visitEnd():465 -> a
     2169:2171:boolean hasReachabilitySensitiveField():588:590 -> a
     2169:2171:void checkReachabilitySensitivity():576 -> a
-    2169:2171:void visitEnd():466 -> a
+    2169:2171:void visitEnd():465 -> a
     2172:2172:void checkReachabilitySensitivity():577:577 -> a
-    2172:2172:void visitEnd():466 -> a
+    2172:2172:void visitEnd():465 -> a
     2173:2173:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
     2173:2173:void checkReachabilitySensitivity():577 -> a
-    2173:2173:void visitEnd():466 -> a
+    2173:2173:void visitEnd():465 -> a
     2174:2177:void checkReachabilitySensitivity():577:580 -> a
-    2174:2177:void visitEnd():466 -> a
+    2174:2177:void visitEnd():465 -> a
     2178:2194:void checkRecord():533:549 -> a
-    2178:2194:void visitEnd():467 -> a
+    2178:2194:void visitEnd():466 -> a
     2195:2195:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     2195:2195:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
     2195:2195:void checkRecord():549 -> a
-    2195:2195:void visitEnd():467 -> a
+    2195:2195:void visitEnd():466 -> a
     2196:2196:void checkRecord():549:549 -> a
-    2196:2196:void visitEnd():467 -> a
-    2197:2215:void visitEnd():468:486 -> a
-    2216:2216:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
-    2216:2216:void visitEnd():487 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2196:2196:void visitEnd():466 -> a
+    2197:2216:void visitEnd():467:486 -> a
     2217:2217:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
     2217:2217:void visitEnd():487 -> a
-    2218:2219:void visitEnd():487:488 -> a
-    2220:2251:void visitEnd():469:500 -> a
-    2252:2260:void com.android.tools.r8.graph.DexClass.replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):1086:1094 -> a
-    2252:2260:void visitEnd():501 -> a
-    2261:2269:void visitEnd():502:510 -> a
-    2270:2270:void visitEnd():506:506 -> a
-    2271:2271:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    2271:2271:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    2271:2271:void visitEnd():506 -> a
-    2272:2295:void visitEnd():506:529 -> a
-    2296:2296:void checkRecord():544:544 -> a
-    2296:2296:void visitEnd():467 -> a
-    2297:2297:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    2297:2297:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    2297:2297:void checkRecord():544 -> a
-    2297:2297:void visitEnd():467 -> a
-    2298:2298:void checkRecord():544:544 -> a
-    2298:2298:void visitEnd():467 -> a
-    2299:2305:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.ClassKind):555:561 -> a
-    2306:2306:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):599:599 -> a
-    2306:2306:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):211 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2307:2309:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):600:602 -> a
-    2307:2309:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):211 -> a
-    2310:2313:java.util.List getAnnotations():610:613 -> a
-    2310:2313:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):450 -> a
-    2314:2314:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):450:450 -> a
+    2218:2218:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> a
+    2218:2218:void visitEnd():487 -> a
+    2219:2220:void visitEnd():487:488 -> a
+    2221:2253:void visitEnd():468:500 -> a
+    2254:2262:void com.android.tools.r8.graph.DexClass.replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):1100:1108 -> a
+    2254:2262:void visitEnd():501 -> a
+    2263:2271:void visitEnd():502:510 -> a
+    2272:2272:void visitEnd():506:506 -> a
+    2273:2273:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    2273:2273:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    2273:2273:void visitEnd():506 -> a
+    2274:2297:void visitEnd():506:529 -> a
+    2298:2298:void checkRecord():544:544 -> a
+    2298:2298:void visitEnd():466 -> a
+    2299:2299:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    2299:2299:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    2299:2299:void checkRecord():544 -> a
+    2299:2299:void visitEnd():466 -> a
+    2300:2300:void checkRecord():544:544 -> a
+    2300:2300:void visitEnd():466 -> a
+    2301:2307:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.ClassKind):555:561 -> a
+    2308:2308:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):599:599 -> a
+    2308:2308:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):211 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2309:2311:void addDefaultAnnotation(java.lang.String,com.android.tools.r8.graph.DexValue):600:602 -> a
+    2309:2311:void access$1600(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):211 -> a
+    2312:2315:java.util.List getAnnotations():610:613 -> a
+    2312:2315:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):449 -> a
+    2316:2316:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):449:449 -> a
     1:1:com.android.tools.r8.cf.CfVersion access$1100(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):211:211 -> b
-    2:4:void visitNestMember(java.lang.String):310:312 -> b
-    5:9:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):336:340 -> b
+    2:4:void visitNestMember(java.lang.String):311:313 -> b
+    5:9:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):337:341 -> b
     10:10:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> b
-    10:10:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):342 -> b
+    10:10:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):343 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:11:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> b
-    11:11:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):342 -> b
-    12:14:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):342:344 -> b
-    15:18:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):343:346 -> b
+    11:11:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):343 -> b
+    12:14:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):343:345 -> b
+    15:18:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):344:347 -> b
     19:19:boolean isInANest():617:617 -> b
     1:1:java.util.Set access$1200(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):211:211 -> c
-    2:3:void visitPermittedSubclass(java.lang.String):351:352 -> c
-    4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> c
-    4:4:void visitPermittedSubclass(java.lang.String):352 -> c
-    5:5:void visitPermittedSubclass(java.lang.String):352:352 -> c
+    2:4:void visitPermittedSubclass(java.lang.String):352:354 -> c
     1:1:java.util.List access$1400(com.android.tools.r8.graph.JarClassFileReader$CreateDexClassVisitor):211:211 -> d
     2:2:void checkName(java.lang.String):565:565 -> d
     3:3:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> d
@@ -34472,7 +34580,7 @@
     4:4:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.graph.JarApplicationReader.getFactory():45:45 -> d
     4:4:void checkName(java.lang.String):565 -> d
     5:6:void checkName(java.lang.String):565:566 -> d
-    7:14:boolean com.android.tools.r8.graph.DexString.isValidSimpleName(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):404:411 -> d
+    7:14:boolean com.android.tools.r8.graph.DexString.isValidSimpleName(com.android.tools.r8.utils.AndroidApiLevel,java.lang.String):408:415 -> d
     7:14:void checkName(java.lang.String):566 -> d
     15:15:void checkName(java.lang.String):567:567 -> d
     16:16:void checkName(java.lang.String):0:0 -> d
@@ -34598,11 +34706,11 @@
     1:3:void visitEnd():903:905 -> c
     4:5:boolean classRequiresCode():895:896 -> c
     4:5:void visitEnd():905 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():2026:2026 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():2002:2002 -> c
     6:6:boolean classRequiresCode():896 -> c
     6:6:void visitEnd():905 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():2026:2026 -> c
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():2002:2002 -> c
     7:7:boolean classRequiresCode():896 -> c
     7:7:void visitEnd():905 -> c
     8:10:boolean classRequiresCode():896:898 -> c
@@ -34641,7 +34749,7 @@
     73:83:void visitEnd():946:956 -> c
     84:84:void visitEnd():953:953 -> c
     85:93:void visitEnd():951:959 -> c
-com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.internal.Tw:
+com.android.tools.r8.graph.JarClassFileReader$ReparseContext -> com.android.tools.r8.internal.Zw:
     com.android.tools.r8.graph.DexClass owner -> b
     byte[] classCache -> a
     java.util.List codeList -> c
@@ -34716,7 +34824,7 @@
     com.android.tools.r8.graph.DexClass clazz -> c
     1:7:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):338:344 -> <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[]):350:360 -> a
-com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.HC:
+com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.NC:
     boolean lineInfo -> a
     boolean localInfo -> b
     int asmReaderOptions -> c
@@ -34768,10 +34876,10 @@
     10:17:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):496 -> a
     18:21:void visitFrame(int,int,java.lang.Object[],int,java.lang.Object[]):499:502 -> a
     22:26:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):530:534 -> a
-    27:27:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):84:84 -> a
+    27:27:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):83:83 -> a
     27:27:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):534 -> a
     28:29:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):536:537 -> a
-    30:30:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):84:84 -> a
+    30:30:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):83:83 -> a
     30:30:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):537 -> a
     31:33:com.android.tools.r8.cf.code.frame.FrameType getFrameType(java.lang.Object,com.android.tools.r8.cf.code.CfFrame$Builder):538:540 -> a
     34:46:com.android.tools.r8.graph.DexType parseAsmType(java.lang.Object):552:564 -> a
@@ -35380,10 +35488,10 @@
     2535:2540:void visitTableSwitchInsn(int,int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label[]):1015:1020 -> a
     2541:2545:void visitLookupSwitchInsn(com.android.tools.r8.org.objectweb.asm.Label,int[],com.android.tools.r8.org.objectweb.asm.Label[]):1025:1029 -> a
     2546:2546:void visitMultiANewArrayInsn(java.lang.String,int):1034:1034 -> a
-    2547:2547:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    2547:2547:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     2547:2547:void visitMultiANewArrayInsn(java.lang.String,int):1035 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2548:2548:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    2548:2548:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     2548:2548:void visitMultiANewArrayInsn(java.lang.String,int):1035 -> a
     2549:2579:void visitMultiANewArrayInsn(java.lang.String,int):1035:1065 -> a
     2580:2583:boolean com.android.tools.r8.utils.DescriptorUtils.isPrimitiveDescriptor(java.lang.String):221:224 -> a
@@ -35487,7 +35595,7 @@
     32:34:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):473:475 -> c
     32:34:void finalizeFramesWithIncompleteUninitializedNew():458 -> c
     32:34:void visitEnd():437 -> c
-    35:35:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):84:84 -> c
+    35:35:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):83:83 -> c
     35:35:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):475 -> c
     35:35:void finalizeFramesWithIncompleteUninitializedNew():458 -> c
     35:35:void visitEnd():437 -> c
@@ -35496,7 +35604,7 @@
     42:44:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):473:475 -> c
     42:44:void finalizeFramesWithIncompleteUninitializedNew():463 -> c
     42:44:void visitEnd():437 -> c
-    45:45:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):84:84 -> c
+    45:45:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):83:83 -> c
     45:45:com.android.tools.r8.cf.code.frame.UninitializedNew fixupUninitializedNew(com.android.tools.r8.cf.code.frame.UninitializedNew):475 -> c
     45:45:void finalizeFramesWithIncompleteUninitializedNew():463 -> c
     45:45:void visitEnd():437 -> c
@@ -35636,7 +35744,7 @@
     2:4:void addProgramClassPotentiallyOverridingNonProgramClass(com.android.tools.r8.graph.DexProgramClass):307:309 -> b
     com.android.tools.r8.graph.DexApplication$Builder self() -> d
     1:5:com.android.tools.r8.graph.LazyLoadedDexApplication build():314:318 -> e
-com.android.tools.r8.graph.LibraryDefinition -> com.android.tools.r8.internal.ZC:
+com.android.tools.r8.graph.LibraryDefinition -> com.android.tools.r8.internal.fD:
     1:1:com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext):21:21 -> a
 com.android.tools.r8.graph.LibraryField -> com.android.tools.r8.graph.E2:
     boolean $assertionsDisabled -> f
@@ -35666,7 +35774,7 @@
     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):582:582 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):596:596 -> 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
@@ -35674,7 +35782,7 @@
     32:33:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
     32:33:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):79 -> a
     32:33:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
-com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.QE:
+com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.XE:
     com.android.tools.r8.graph.DexClassAndMethod method -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
@@ -35683,14 +35791,14 @@
     1:1:com.android.tools.r8.graph.DexClassAndMethod getImplementationMethod():38:38 -> b
     boolean isLambdaTarget() -> o
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> p
-com.android.tools.r8.graph.LookupMethodTarget -> com.android.tools.r8.internal.RE:
+com.android.tools.r8.graph.LookupMethodTarget -> com.android.tools.r8.internal.YE:
     com.android.tools.r8.graph.DexClass getHolder() -> a
     1:1:void accept(java.util.function.Consumer,java.util.function.Consumer):23:23 -> a
     com.android.tools.r8.graph.DexEncodedMethod getDefinition() -> e
     com.android.tools.r8.graph.LookupMethodTarget asMethodTarget() -> f
     boolean isMethodTarget() -> g
     com.android.tools.r8.graph.DexClassAndMethod getTarget() -> m
-com.android.tools.r8.graph.LookupMethodTargetWithAccessOverride -> com.android.tools.r8.internal.SE:
+com.android.tools.r8.graph.LookupMethodTargetWithAccessOverride -> com.android.tools.r8.internal.ZE:
     com.android.tools.r8.graph.DexClassAndMethod accessOverride -> c
     com.android.tools.r8.graph.DexClassAndMethod target -> b
     1:3:void <init>(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClassAndMethod):12:14 -> <init>
@@ -35751,14 +35859,14 @@
     5:5:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder addTypeCausingFailure(com.android.tools.r8.graph.DexType):188:188 -> a
     6:6:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$Builder setState(com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState):193:193 -> a
     7:7:com.android.tools.r8.graph.LookupResult$LookupResultSuccess build():198:198 -> a
-com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.UE:
+com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.bF:
     void accept(java.util.function.Consumer,java.util.function.Consumer) -> a
     com.android.tools.r8.graph.LookupMethodTarget asMethodTarget() -> f
     boolean isMethodTarget() -> g
     com.android.tools.r8.graph.DexClassAndMethod getAccessOverride() -> n
     boolean isLambdaTarget() -> o
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> p
-com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.RF:
+com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.YF:
     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):25:25 -> a
@@ -35871,7 +35979,7 @@
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase setStatic():251 -> f
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():373:374 -> g
     1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase setSynthetic():251 -> g
-com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.jG:
+com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.qG:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -35897,7 +36005,7 @@
     2:2:void forEachStaticInvoke(java.util.function.BiConsumer):72:72 -> c
     1:1:void forEachSuperInvoke(java.util.function.BiConsumer):76:76 -> d
     1:1:void forEachVirtualInvoke(java.util.function.BiConsumer):84:84 -> e
-com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.fG:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.mG:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -35949,13 +36057,13 @@
     1:1:boolean registerInvokeStaticInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:200 -> h
     1:1:boolean registerInvokeSuperInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):208:208 -> i
     1:1:boolean registerInvokeVirtualInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):216:216 -> j
-com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.gG:
+com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.nG:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):237:237 -> <init>
     2:2:void <init>():241:241 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.hG:
+com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.oG:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):245:245 -> <init>
     2:2:void <init>():249:249 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.iG:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.pG:
     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):253:253 -> <init>
     2:2:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map):261:261 -> <init>
     1:5:void addAll(com.android.tools.r8.graph.MethodAccessInfoCollection):265:269 -> a
@@ -36591,13 +36699,13 @@
     47:47:com.android.tools.r8.graph.MethodResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):228:228 -> a
     47:47:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):161 -> a
     48:48:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):177:177 -> a
-    49:49: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):624:624 -> a
+    49:49: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):638:638 -> a
     49:49:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):177 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    50:63: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):624:637 -> a
+    50:63: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):638:651 -> a
     50:63:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):177 -> a
     64:64:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):179:179 -> a
-    65:65:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):614:614 -> a
+    65:65:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):628:628 -> a
     65:65:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):183 -> a
     66:67:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):190:191 -> a
     68:68:void com.android.tools.r8.graph.MethodResolutionResult$IllegalAccessOrNoSuchMethodResult.<init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):1245:1245 -> a
@@ -36624,10 +36732,10 @@
     127:127:void lambda$resolveMethodStep3Helper$4(com.android.tools.r8.graph.MethodResolution$UniquePathOracle,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):408:408 -> a
     128:165:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolution$MaximallySpecificMethodsBuilder,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.MethodResolution$UniquePathOracle):427:464 -> a
     166:175:void lambda$resolveMethodStep3Helper$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ClassResolutionResult,com.android.tools.r8.graph.MethodResolution$MaximallySpecificMethodsBuilder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.MethodResolution$UniquePathOracle,com.android.tools.r8.graph.DexClass):432:441 -> a
-    176:176:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):614:614 -> a
+    176:176:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):628:628 -> a
     176:176:void lambda$resolveMethodStep3Helper$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ClassResolutionResult,com.android.tools.r8.graph.MethodResolution$MaximallySpecificMethodsBuilder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.MethodResolution$UniquePathOracle,com.android.tools.r8.graph.DexClass):442 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    177:177:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):614:614 -> a
+    177:177:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):628:628 -> a
     177:177:void lambda$resolveMethodStep3Helper$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ClassResolutionResult,com.android.tools.r8.graph.MethodResolution$MaximallySpecificMethodsBuilder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.MethodResolution$UniquePathOracle,com.android.tools.r8.graph.DexClass):442 -> a
     178:178:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):491:491 -> a
     178:178:void lambda$resolveMethodStep3Helper$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ClassResolutionResult,com.android.tools.r8.graph.MethodResolution$MaximallySpecificMethodsBuilder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.MethodResolution$UniquePathOracle,com.android.tools.r8.graph.DexClass):443 -> a
@@ -36636,10 +36744,10 @@
     191:191:void lambda$resolveMethodStep3Helper$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ClassResolutionResult,com.android.tools.r8.graph.MethodResolution$MaximallySpecificMethodsBuilder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.MethodResolution$UniquePathOracle,com.android.tools.r8.graph.DexClass):450:450 -> a
     192:204:void lambda$resolveMethodStep3Helper$6(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.MethodResolution$MaximallySpecificMethodsBuilder,com.android.tools.r8.graph.MethodResolution$UniquePathOracle,com.android.tools.r8.graph.DexClass):467:479 -> a
     205:205:void lambda$resolveMethodStep3Helper$6(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.MethodResolution$MaximallySpecificMethodsBuilder,com.android.tools.r8.graph.MethodResolution$UniquePathOracle,com.android.tools.r8.graph.DexClass):473:473 -> a
-    206:206:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):614:614 -> a
+    206:206:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):628:628 -> a
     206:206:void lambda$resolveMethodOnInterface$8(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.MethodResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):539 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    207:207:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):614:614 -> a
+    207:207:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):628:628 -> a
     207:207:void lambda$resolveMethodOnInterface$8(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.MethodResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):539 -> a
     208:212:void lambda$resolveMethodOnInterface$8(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.MethodResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):540:544 -> a
     213:213:void lambda$resolveMethodOnInterface$8(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.MethodResolutionResult$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):543:543 -> a
@@ -36666,10 +36774,10 @@
     31:35:void lambda$resolveMethodOnInterface$7(com.android.tools.r8.graph.MethodResolutionResult$Builder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):516:520 -> b
     36:36:void lambda$resolveMethodOnInterface$7(com.android.tools.r8.graph.MethodResolutionResult$Builder,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexClass):519:519 -> b
     37:37:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):528:528 -> b
-    38:38:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):614:614 -> b
+    38:38:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):628:628 -> b
     38:38:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):530 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    39:39:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):614:614 -> b
+    39:39:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):628:628 -> b
     39:39:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):530 -> b
     40:61:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):532:553 -> b
     1:17:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):507:523 -> c
@@ -37031,11 +37139,11 @@
     284:300:com.android.tools.r8.graph.LookupMethodTarget lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):719:735 -> a
     301:301:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):811:811 -> a
     301:301:com.android.tools.r8.graph.LookupMethodTarget lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):735 -> a
-    302:302:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):582:582 -> a
+    302:302:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):596:596 -> a
     302:302:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):811 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     302:302:com.android.tools.r8.graph.LookupMethodTarget lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):735 -> a
-    303:303:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):582:582 -> a
+    303:303:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):596:596 -> a
     303:303:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):811 -> a
     303:303:com.android.tools.r8.graph.LookupMethodTarget lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):735 -> a
     304:306:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):812:814 -> a
@@ -37043,7 +37151,7 @@
     307:307:com.android.tools.r8.graph.LookupMethodTarget lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):736:736 -> a
     308:314:com.android.tools.r8.graph.DexClassAndMethod findWideningOverride(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):822:828 -> a
     308:314:com.android.tools.r8.graph.LookupMethodTarget lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):737 -> a
-    315:315:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):582:582 -> a
+    315:315:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):596:596 -> a
     315:315:com.android.tools.r8.graph.DexClassAndMethod findWideningOverride(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):828 -> a
     315:315:com.android.tools.r8.graph.LookupMethodTarget lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):737 -> a
     316:319:com.android.tools.r8.graph.DexClassAndMethod findWideningOverride(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):830:833 -> a
@@ -37077,11 +37185,11 @@
     1:2:com.android.tools.r8.graph.ProgramMethod getResolvedProgramMethod():279:280 -> s
     boolean isSingleResolution() -> x
     1:1:boolean isVirtualTarget():327:327 -> y
-com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.kI:
+com.android.tools.r8.graph.NamingLensComparable -> com.android.tools.r8.internal.rI:
     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):23:24 -> 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.uI:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.BI:
     com.android.tools.r8.graph.DexType nestHost -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
@@ -37092,7 +37200,7 @@
     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 -> m
-com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.vI:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.CI:
     com.android.tools.r8.graph.DexType nestMember -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():15:15 -> <clinit>
@@ -37193,7 +37301,7 @@
     1:1:boolean isContextFreeForMethods():302:302 -> g
     boolean isLegitimateToHaveEmptyMappings() -> m
     1:19:java.lang.String toString():313:331 -> toString
-com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.IL:
+com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.ZL:
 com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.graph.p3:
     java.util.Map classesWithAllocationSiteTracking -> a
     java.util.Set annotationsWithUnknownSubtypeHierarchy -> c
@@ -37263,10 +37371,10 @@
     537:544: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):361 -> a
     545:554: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):362:371 -> a
     555:555:boolean recordInstantiatedAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):378:378 -> a
-    556:556:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    556:556:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     556:556:boolean recordInstantiatedAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):379 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    557:557:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    557:557:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     557:557:boolean recordInstantiatedAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):379 -> a
     558:560:boolean recordInstantiatedAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):379:381 -> a
     561:561:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):399:399 -> a
@@ -37330,10 +37438,10 @@
     2715:2715:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):564:564 -> a
     2710:2710:boolean verifyAllSuperTypesAreInHierarchy(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Iterable):564:564 -> a
     1:1:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):388:388 -> b
-    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> b
+    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> b
     2:2:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):389 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> b
+    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> b
     3:3:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):389 -> b
     4:6:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):389:391 -> b
     7:7:java.util.List lambda$recordInstantiatedLambdaInterface$1(com.android.tools.r8.graph.DexType):399:399 -> b
@@ -37352,7 +37460,7 @@
     2:4:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter):299:301 -> <init>
     1:1:boolean access$300(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):294:294 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):294:294 -> b
-com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.qM:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.HM:
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils lensCodeRewriter -> e
     boolean $assertionsDisabled -> p
     com.android.tools.r8.graph.AppView appView -> b
@@ -37428,12 +37536,12 @@
     1:1:java.util.Collection getStrings():299:299 -> m
     1:1:java.util.Collection getTypes():287:287 -> n
     1:1:boolean hasJumboStrings():311:311 -> o
-com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.oM:
+com.android.tools.r8.graph.ObjectToOffsetMapping$1 -> com.android.tools.r8.internal.FM:
     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):115:115 -> <init>
     1:1:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):119:119 -> a
     2:4:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):124:124 -> a
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.pM:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.GM:
     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):208:208 -> <init>
@@ -37459,7 +37567,7 @@
     23:23: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):59:59 -> a
     23:23:int getDepth(com.android.tools.r8.graph.DexProgramClass):231 -> a
     24:27:int getDepth(com.android.tools.r8.graph.DexProgramClass):232:235 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.zM:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.QM:
     com.android.tools.r8.graph.DexProto[] protos -> c
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> h
     boolean $assertionsDisabled -> i
@@ -37554,15 +37662,26 @@
     1:1:com.android.tools.r8.graph.DexAnnotationSet[] getAnnotationSets():136:136 -> n0
     1:7:com.android.tools.r8.graph.ParameterAnnotationsList withFakeThisParameter():214:220 -> o0
     1:1:int size():157:157 -> size
-com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.VN:
+com.android.tools.r8.graph.PermittedSubclassAttribute -> com.android.tools.r8.internal.jO:
+    com.android.tools.r8.graph.DexType permittedSubclass -> b
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexType):23:24 -> <init>
+    com.android.tools.r8.utils.structural.StructuralItem self() -> E
+    1:1:com.android.tools.r8.graph.DexType lambda$specify$0(com.android.tools.r8.graph.PermittedSubclassAttribute):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 getPermittedSubclass():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 -> m
+com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.nO:
     boolean isPinned(com.android.tools.r8.graph.DexDefinition) -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.YO:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.qP:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set visited -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView):33:33 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.AppView):31:34 -> <init>
     1:1:void accept(com.android.tools.r8.graph.DexProgramClass):51:51 -> a
-    2:2:boolean com.android.tools.r8.graph.DexClass.hasSuperType():792:792 -> a
+    2:2:boolean com.android.tools.r8.graph.DexClass.hasSuperType():806:806 -> a
     2:2:void accept(com.android.tools.r8.graph.DexProgramClass):52 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:void accept(com.android.tools.r8.graph.DexProgramClass):53:53 -> a
@@ -37577,7 +37696,7 @@
     12:12:void accept(com.android.tools.r8.graph.DexProgramClass):56:56 -> a
     13:14:void run(com.android.tools.r8.graph.DexProgramClass[]):61:62 -> a
     void visit(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.aP:
+com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.sP:
     com.android.tools.r8.graph.ProgramDerivedContext asProgramDerivedContext(com.android.tools.r8.graph.ProgramDerivedContext) -> a
     1:1:void rewriteAllAnnotations(java.util.function.BiFunction):43:43 -> a
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> b
@@ -37589,7 +37708,7 @@
     com.android.tools.r8.graph.ProgramDefinition asProgramDefinition() -> h
     boolean isProgramDefinition() -> i
     1:1:void clearAllAnnotations():38:38 -> z
-com.android.tools.r8.graph.ProgramDerivedContext -> com.android.tools.r8.internal.bP:
+com.android.tools.r8.graph.ProgramDerivedContext -> com.android.tools.r8.internal.tP:
     1:1:boolean isProgramContext():12:12 -> B
 com.android.tools.r8.graph.ProgramField -> com.android.tools.r8.graph.r3:
     boolean $assertionsDisabled -> f
@@ -37606,7 +37725,7 @@
     1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo():10 -> c0
     com.android.tools.r8.graph.DexClassAndField asField() -> d
     com.android.tools.r8.graph.ProgramField asField() -> d
-com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.gP:
+com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.yP:
     com.android.tools.r8.graph.DexProgramClass getHolder() -> a
     com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinInfo() -> c0
     com.android.tools.r8.graph.DexEncodedMember getDefinition() -> e
@@ -37627,11 +37746,11 @@
     11:11:void registerCodeReferences(com.android.tools.r8.graph.UseRegistry):127:127 -> a
     12:14:com.android.tools.r8.graph.DexProgramClass getHolder():173:175 -> a
     15:19:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):190:194 -> a
-    20:20:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    20:20:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     20:20:boolean keepLocals(com.android.tools.r8.graph.AppView):202 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):195 -> a
-    21:21:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    21:21:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     21:21:boolean keepLocals(com.android.tools.r8.graph.AppView):202 -> a
     21:21:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):195 -> a
     22:25:boolean keepLocals(com.android.tools.r8.graph.AppView):202:205 -> a
@@ -37666,7 +37785,7 @@
     2:2:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):114 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:5:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):115:117 -> e
-    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):137:137 -> e
+    6:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):138:138 -> e
     6:6:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):117 -> e
     7:7:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):118:118 -> e
     8:8:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):144:144 -> e
@@ -37683,8 +37802,8 @@
     31:33:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):118 -> e
     34:34:void com.android.tools.r8.ir.conversion.MethodOptimizationFeedback.unsetOptimizationInfoForThrowNullMethod(com.android.tools.r8.graph.ProgramMethod):146:146 -> e
     34:34:void convertToThrowNullMethod(com.android.tools.r8.graph.AppView):118 -> e
-com.android.tools.r8.graph.ProgramOrClasspathClass -> com.android.tools.r8.internal.mP:
-com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.nP:
+com.android.tools.r8.graph.ProgramOrClasspathClass -> com.android.tools.r8.internal.EP:
+com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.FP:
     java.util.Set classes -> c
     java.lang.String packageDescriptor -> b
     boolean $assertionsDisabled -> d
@@ -37693,9 +37812,9 @@
     1:2:boolean add(com.android.tools.r8.graph.DexProgramClass):31:32 -> a
     3:3:void forEachField(java.util.function.Consumer):60:60 -> a
     4:4:java.util.Set classesInPackage():68:68 -> a
-    5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> a
+    5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> a
     5:5:void lambda$forEachField$0(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):60 -> a
-    6:6:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> a
+    6:6:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> a
     6:6:void lambda$forEachField$0(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean contains(com.android.tools.r8.graph.DexProgramClass):36:36 -> b
@@ -37712,11 +37831,11 @@
     2:2:java.lang.String com.android.tools.r8.graph.ProgramPackage.getPackageName():52:52 -> toString
     2:2:java.lang.String toString():78 -> toString
     3:3:java.lang.String toString():78:78 -> toString
-com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.oP:
+com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.GP:
     java.util.Map packages -> b
     1:2:void <init>(java.util.Map):15:16 -> <init>
     1:1:java.util.Iterator iterator():49:49 -> iterator
-com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.ZR:
+com.android.tools.r8.graph.PrunedItems -> com.android.tools.r8.internal.sS:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -37739,11 +37858,10 @@
     1:1:java.util.Set getRemovedMethods():107:107 -> g
     1:1:boolean hasRemovedClasses():83:83 -> h
     1:1:boolean hasRemovedFields():87:87 -> i
-    1:1:boolean hasRemovedMembers():91:91 -> j
-    1:1:boolean hasRemovedMethods():95:95 -> k
-    1:4:boolean isEmpty():48:51 -> l
-    1:1:com.android.tools.r8.graph.PrunedItems$Builder toBuilder():40:40 -> m
-com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.YR:
+    1:1:boolean hasRemovedMethods():95:95 -> j
+    1:4:boolean isEmpty():48:51 -> k
+    1:1:com.android.tools.r8.graph.PrunedItems$Builder toBuilder():40:40 -> l
+com.android.tools.r8.graph.PrunedItems$Builder -> com.android.tools.r8.internal.rS:
     com.android.tools.r8.graph.DexApplication prunedApp -> a
     java.util.Set noLongerSyntheticItems -> c
     java.util.Set removedClasses -> d
@@ -37763,7 +37881,7 @@
     9:9:com.android.tools.r8.graph.PrunedItems build():180:180 -> a
     1:1:com.android.tools.r8.graph.PrunedItems$Builder setRemovedClasses(java.util.Set):170:170 -> b
     1:1:com.android.tools.r8.graph.PrunedItems$Builder setRemovedMethods(java.util.Set):175:175 -> c
-com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer -> com.android.tools.r8.internal.fW:
+com.android.tools.r8.graph.RewrittenPrototypeDescriptionMethodOptimizationInfoFixer -> com.android.tools.r8.internal.AW:
     com.android.tools.r8.graph.proto.RewrittenPrototypeDescription prototypeChanges -> a
     1:1:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer.<init>():18:18 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):29 -> <init>
@@ -37823,7 +37941,7 @@
     1:1:java.util.BitSet fixupNonNullParamOnNormalExits(java.util.BitSet):111:111 -> b
     1:1:java.util.BitSet fixupNonNullParamOrThrow(java.util.BitSet):120:120 -> c
     1:1:java.util.BitSet fixupUnusedArguments(java.util.BitSet):158:158 -> d
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.HX:
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.cY:
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):20:20 -> <init>
     1:10:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):25:34 -> a
     11:17:java.lang.String smali(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):26:32 -> a
@@ -37831,11 +37949,11 @@
     1:3:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):62:64 -> b
     4:6:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):69:71 -> b
     1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):43:55 -> c
-com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.QX:
+com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.lY:
     1:1:void <init>(java.lang.String):12:12 -> <init>
     1:1:int lambda$new$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):12:12 -> a
     1:1:java.util.Set lambda$new$1():12:12 -> d
-com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.RX:
+com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.mY:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -37967,7 +38085,7 @@
     565:565:java.lang.String toString():280:280 -> toString
     566:566:java.lang.String toString():280:280 -> toString
     567:567:java.lang.String toString():280:280 -> toString
-com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.b00:
+com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.w00:
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     com.android.tools.r8.graph.DexEncodedMember getResolvedMember() -> b
     com.android.tools.r8.graph.DexClassAndMember getResolutionPair() -> c
@@ -37994,7 +38112,7 @@
     9:9:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193:193 -> a
     9:9:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     9:9:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):87 -> a
-    10:10:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    10:10:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):277:277 -> a
     10:10:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):193 -> a
     10:10:void com.android.tools.r8.graph.DexMethod.collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection):179 -> a
     10:10:void collectIndexedItems(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):87 -> a
@@ -38072,7 +38190,7 @@
     2:2:void lambda$getInstructionBuilders$0(com.android.tools.r8.ir.conversion.IRBuilder):290 -> d
     1:1:void lambda$getInstructionBuilders$1(com.android.tools.r8.ir.conversion.IRBuilder):290:290 -> e
     1:1:java.util.List getInstructionBuilders():290:290 -> f
-com.android.tools.r8.graph.ThrowingInitClassLens -> com.android.tools.r8.internal.S00:
+com.android.tools.r8.graph.ThrowingInitClassLens -> com.android.tools.r8.internal.o10:
     com.android.tools.r8.graph.ThrowingInitClassLens INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -38091,7 +38209,7 @@
     31:31:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):21:21 -> a
     24:24:com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType):21:21 -> a
     1:1:com.android.tools.r8.graph.ThrowingInitClassLens getInstance():16:16 -> c
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.l10:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.H10:
     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:3:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:61 -> a
@@ -38142,79 +38260,82 @@
     22:22:java.util.List fixupClasses(java.util.Collection):91:91 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass lambda$fixupClasses$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):92:92 -> a
     24:27:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):99:102 -> a
-    28:28:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    28:28:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     28:28:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):103 -> a
     29:30:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):104:105 -> a
-    31:31:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):342:342 -> a
+    31:31:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):360:360 -> a
     31:31:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):106 -> a
-    32:36:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):331:335 -> a
-    32:36:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):342 -> a
+    32:36:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):349:353 -> a
+    32:36:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):360 -> a
     32:36:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):106 -> a
-    37:37:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):343:343 -> a
+    37:37:com.android.tools.r8.graph.DexTypeList fixupTypeList(com.android.tools.r8.graph.DexTypeList):361:361 -> a
     37:37:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):106 -> a
     38:39:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):107:108 -> a
-    40:40:com.android.tools.r8.graph.NestHostClassAttribute fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):253:253 -> a
+    40:40:com.android.tools.r8.graph.NestHostClassAttribute fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):254:254 -> a
     40:40:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):108 -> a
     41:41:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):109:109 -> a
-    42:51:java.util.List fixupNestMemberAttributes(java.util.List):259:268 -> a
+    42:51:java.util.List fixupNestMemberAttributes(java.util.List):260:269 -> a
     42:51:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):109 -> a
-    52:61:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):110:119 -> a
-    62:62:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):161:161 -> a
-    62:62:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):119 -> a
-    63:64:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):119:120 -> a
-    65:65:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):161:161 -> a
-    65:65:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):120 -> a
-    66:78:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):120:132 -> a
-    79:79:com.android.tools.r8.graph.DexProgramClass recordClassChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):44:44 -> a
-    79:79:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):133 -> a
-    80:80:com.android.tools.r8.graph.MethodCollection lambda$fixupClass$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):116:116 -> a
-    81:93:com.android.tools.r8.graph.EnclosingMethodAttribute fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):143:155 -> a
-    94:98:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):167:171 -> a
-    99:103:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField,java.util.function.Consumer):178:182 -> a
-    99:103:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):171 -> a
-    104:104:com.android.tools.r8.graph.DexEncodedField recordFieldChange(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):49:49 -> a
-    104:104:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField,java.util.function.Consumer):181 -> a
-    104:104:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):171 -> a
-    105:105:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):171:171 -> a
-    106:108:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):189:191 -> a
-    109:115:java.util.List fixupInnerClassAttributes(java.util.List):196:202 -> a
-    116:116:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):310:310 -> a
-    116:116:java.util.List fixupInnerClassAttributes(java.util.List):203 -> a
-    117:117:java.util.List fixupInnerClassAttributes(java.util.List):204:204 -> a
-    118:118:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):310:310 -> a
-    118:118:java.util.List fixupInnerClassAttributes(java.util.List):205 -> a
-    119:130:java.util.List fixupInnerClassAttributes(java.util.List):206:217 -> a
-    131:138:java.util.List fixupInnerClassAttributes(java.util.List):216:223 -> a
-    139:139:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():665:665 -> a
-    139:139:java.util.List fixupInnerClassAttributes(java.util.List):223 -> a
+    52:52:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):110:110 -> a
+    53:62:java.util.List fixupPermittedSubclassAttribute(java.util.List):277:286 -> a
+    53:62:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):110 -> a
+    63:72:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):111:120 -> a
+    73:73:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):162:162 -> a
+    73:73:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):120 -> a
+    74:75:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):120:121 -> a
+    76:76:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):162:162 -> a
+    76:76:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):121 -> a
+    77:89:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):121:133 -> a
+    90:90:com.android.tools.r8.graph.DexProgramClass recordClassChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):44:44 -> a
+    90:90:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):134 -> a
+    91:91:com.android.tools.r8.graph.MethodCollection lambda$fixupClass$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):117:117 -> a
+    92:104:com.android.tools.r8.graph.EnclosingMethodAttribute fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):144:156 -> a
+    105:109:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):168:172 -> a
+    110:114:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField,java.util.function.Consumer):179:183 -> a
+    110:114:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):172 -> a
+    115:115:com.android.tools.r8.graph.DexEncodedField recordFieldChange(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):49:49 -> a
+    115:115:com.android.tools.r8.graph.DexEncodedField fixupField(com.android.tools.r8.graph.DexEncodedField,java.util.function.Consumer):182 -> a
+    115:115:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):172 -> a
+    116:116:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List,java.util.function.Consumer):172:172 -> a
+    117:119:com.android.tools.r8.graph.DexField fixupFieldReference(com.android.tools.r8.graph.DexField):190:192 -> a
+    120:126:java.util.List fixupInnerClassAttributes(java.util.List):197:203 -> a
+    127:127:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):328:328 -> a
+    127:127:java.util.List fixupInnerClassAttributes(java.util.List):204 -> a
+    128:128:java.util.List fixupInnerClassAttributes(java.util.List):205:205 -> a
+    129:129:com.android.tools.r8.graph.DexType fixupTypeOrNull(com.android.tools.r8.graph.DexType):328:328 -> a
+    129:129:java.util.List fixupInnerClassAttributes(java.util.List):206 -> a
+    130:141:java.util.List fixupInnerClassAttributes(java.util.List):207:218 -> a
+    142:149:java.util.List fixupInnerClassAttributes(java.util.List):217:224 -> a
+    150:150:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():670:670 -> a
+    150:150:java.util.List fixupInnerClassAttributes(java.util.List):224 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    140:146:java.util.List fixupInnerClassAttributes(java.util.List):223:229 -> a
-    147:147:java.util.List fixupInnerClassAttributes(java.util.List):227:227 -> a
-    148:151:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):237:240 -> a
-    152:153:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):247:248 -> a
-    154:157:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):276:279 -> a
-    154:157:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):248 -> a
-    158:162:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):331:335 -> a
-    158:162:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):279 -> a
-    158:162:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):248 -> a
-    163:164:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):280:281 -> a
-    163:164:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):248 -> a
-    165:165:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):248:248 -> a
-    166:166:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):247:247 -> a
-    167:176:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):315:324 -> a
-    177:177:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):348:348 -> a
-    178:181:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):276:279 -> a
-    178:181:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):348 -> a
-    182:186:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):331:335 -> a
-    182:186:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):279 -> a
-    182:186:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):348 -> a
-    187:188:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):280:281 -> a
-    187:188:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):348 -> a
-    189:189:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.withProto(com.android.tools.r8.graph.DexProto):62:62 -> a
-    189:189:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):348 -> a
-    190:190:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):21:21 -> a
-    190:190:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.withProto(com.android.tools.r8.graph.DexProto):62 -> a
-    190:190:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):348 -> a
+    151:157:java.util.List fixupInnerClassAttributes(java.util.List):224:230 -> a
+    158:158:java.util.List fixupInnerClassAttributes(java.util.List):228:228 -> a
+    159:162:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):238:241 -> a
+    163:164:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):248:249 -> a
+    165:168:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):294:297 -> a
+    165:168:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):249 -> a
+    169:173:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):349:353 -> a
+    169:173:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):297 -> a
+    169:173:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):249 -> a
+    174:175:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):298:299 -> a
+    174:175:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):249 -> a
+    176:176:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):249:249 -> a
+    177:177:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):248:248 -> a
+    178:187:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):333:342 -> a
+    188:188:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):366:366 -> a
+    189:192:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):294:297 -> a
+    189:192:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):366 -> a
+    193:197:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):349:353 -> a
+    193:197:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):297 -> a
+    193:197:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):366 -> a
+    198:199:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):298:299 -> a
+    198:199:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):366 -> a
+    200:200:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.withProto(com.android.tools.r8.graph.DexProto):62:62 -> a
+    200:200:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):366 -> a
+    201:201:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto):21:21 -> a
+    201:201:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.withProto(com.android.tools.r8.graph.DexProto):62 -> a
+    201:201:com.android.tools.r8.graph.DexMethodSignature fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):366 -> 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):65:67 -> b
     4:6:void lambda$recordFailedResolutionChanges$1(com.android.tools.r8.graph.DexMethod):74:76 -> b
@@ -38300,12 +38421,12 @@
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
     1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):133:133 -> h
-com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.internal.Q30:
+com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.internal.m40:
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse ARGUMENT_TO_LAMBDA_METAFACTORY -> b
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse NOT_ARGUMENT_TO_LAMBDA_METAFACTORY -> c
     1:2:void <clinit>():21:22 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
-com.android.tools.r8.graph.UseRegistryWithResult -> com.android.tools.r8.internal.R30:
+com.android.tools.r8.graph.UseRegistryWithResult -> com.android.tools.r8.internal.n40:
     java.lang.Object result -> e
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.Definition,java.lang.Object):16:17 -> <init>
     1:2:void setResult(java.lang.Object):25:26 -> a
@@ -38331,7 +38452,7 @@
     25:25:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.androidapi.AndroidApiLevelCompute.computeApiLevelForDefinition(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.androidapi.ComputedApiLevel):44:44 -> a
     25:25:void computeAndSetApiLevelForDefinition(com.android.tools.r8.graph.DexClassAndMember):93 -> a
     26:26:void computeAndSetApiLevelForDefinition(com.android.tools.r8.graph.DexClassAndMember):92:92 -> a
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.na:
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.qa:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> b
     com.android.tools.r8.graph.DexString kotlinAssertionsEnabled -> c
     java.util.List r8InstructionSequence -> f
@@ -38407,7 +38528,7 @@
     84:106:boolean com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis.hasKotlincClinitAssertionCode(com.android.tools.r8.graph.ProgramMethod):190:212 -> a
     84:106:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):91 -> a
     107:107:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):92:92 -> a
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.Oi:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.Si:
     1:1:void <init>():18:18 -> <init>
     void done(com.android.tools.r8.shaking.Enqueuer) -> a
     void notifyFailedMethodResolutionTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
@@ -38420,12 +38541,12 @@
     void processNewlyLiveField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processTracedCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
-com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis -> com.android.tools.r8.internal.Vi:
+com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis -> com.android.tools.r8.internal.Zi:
     void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> b
-com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround -> com.android.tools.r8.internal.Lm:
+com.android.tools.r8.graph.analysis.GetArrayOfMissingTypeVerifyErrorWorkaround -> com.android.tools.r8.internal.Qm:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> b
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
@@ -38441,7 +38562,7 @@
     21:35:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):80 -> a
     36:36:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):81:81 -> a
     void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist) -> b
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.jq:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.oq:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):62:62 -> <init>
@@ -38449,7 +38570,7 @@
     1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):69:85 -> a
     18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerWorklist):83:83 -> a
     19:19:void done(com.android.tools.r8.shaking.Enqueuer):91:91 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.iq:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.nq:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -38457,7 +38578,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):21:21 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):27:29 -> <init>
     1:18:boolean isClassDefinitelyLoadedInInstanceMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):34:51 -> a
-com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround -> com.android.tools.r8.internal.uw:
+com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround -> com.android.tools.r8.internal.Aw:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> b
     com.android.tools.r8.utils.InternalOptions options -> c
     com.android.tools.r8.graph.DexType androidHardwareCamera2CameraDeviceType -> a
@@ -38468,17 +38589,17 @@
     3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57:57 -> a
     4:4:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):65:65 -> a
     4:4:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     5:5:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):66 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     6:6:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):66 -> a
     6:6:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
     7:7:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):67:67 -> a
     7:7:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
     8:8:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata -> com.android.tools.r8.internal.z6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata -> com.android.tools.r8.internal.B6:
     java.util.Set isReadForInvokeReceiver -> a
     boolean isReadForWrite -> b
     1:1:void <init>(java.util.Set,boolean,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$1):16:16 -> <init>
@@ -38487,7 +38608,7 @@
     1:1:java.util.Set getReadForInvokeReceiver():56:56 -> b
     1:1:boolean isReadForInvokeReceiver():52:52 -> c
     1:1:boolean isReadForWrite():60:60 -> d
-com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder -> com.android.tools.r8.internal.y6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder -> com.android.tools.r8.internal.A6:
     java.util.Set isReadForInvokeReceiver -> a
     boolean isReadForWrite -> b
     boolean $assertionsDisabled -> c
@@ -38499,7 +38620,7 @@
     5:5:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata build():85 -> a
     6:7:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata build():85:86 -> a
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder setIsReadForWrite():80:80 -> b
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata -> com.android.tools.r8.internal.B6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata -> com.android.tools.r8.internal.D6:
     java.util.Map backing -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -38508,7 +38629,7 @@
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder builder(com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider):29:29 -> a
     2:2:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata empty():34:34 -> a
     3:3:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(java.lang.Object):38:38 -> a
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder -> com.android.tools.r8.internal.A6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder -> com.android.tools.r8.internal.C6:
     java.util.Map backing -> b
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider bytecodeMetadataProvider -> a
     boolean $assertionsDisabled -> c
@@ -38518,7 +38639,7 @@
     1:4:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder setMetadata(com.android.tools.r8.ir.code.Instruction,java.lang.Object):52:55 -> a
     5:5:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata build():61:61 -> a
     6:6:boolean verifyNoMetadata(com.android.tools.r8.ir.code.Instruction):65:65 -> a
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider -> com.android.tools.r8.internal.C6:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider -> com.android.tools.r8.internal.E6:
     java.util.Map backing -> a
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider EMPTY -> b
     1:2:void <clinit>():21:22 -> <clinit>
@@ -38526,7 +38647,7 @@
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder builder():31:31 -> a
     2:2:com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata getMetadata(com.android.tools.r8.ir.code.Instruction):43:43 -> a
     1:1:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider empty():35:35 -> b
-com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder -> com.android.tools.r8.internal.C6$a:
+com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder -> com.android.tools.r8.internal.E6$a:
     java.util.Map builders -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():46:46 -> <clinit>
@@ -38534,10 +38655,10 @@
     1:4:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder addMetadata(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):57:60 -> a
     5:11:com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider build():65:71 -> a
     12:12:void lambda$build$0(java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):70:70 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.WF:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.dG:
     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.XF:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.eG:
     java.util.List collection -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -38545,7 +38666,7 @@
     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.G40:
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.c50:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedInterfaces -> b
     boolean $assertionsDisabled -> c
@@ -38704,7 +38825,7 @@
     1:1:void <clinit>():9:9 -> <clinit>
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):13:15 -> <init>
     1:1:int getNewArgumentIndex(int):20:20 -> b
-com.android.tools.r8.graph.proto.DefaultArgumentPermutation -> com.android.tools.r8.internal.of:
+com.android.tools.r8.graph.proto.DefaultArgumentPermutation -> com.android.tools.r8.internal.sf:
     com.android.tools.r8.graph.proto.DefaultArgumentPermutation INSTANCE -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
@@ -38789,7 +38910,7 @@
     31:31:java.util.function.Consumer createParameterAnnotationsRemover(com.android.tools.r8.graph.DexEncodedMethod):78:78 -> a
     32:32:com.android.tools.r8.graph.proto.ArgumentInfoCollection getArgumentInfoCollection():133:133 -> a
     33:36:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):165:168 -> a
-    37:37:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    37:37:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):41:41 -> a
     37:37:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):168 -> a
     38:38:com.android.tools.r8.ir.code.Instruction getConstantReturn(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):169:169 -> a
     39:43:boolean verifyConstantReturnAccessibleInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):175:179 -> a
@@ -38906,7 +39027,7 @@
     4:4:com.android.tools.r8.graph.proto.RewrittenTypeInfo build():160:160 -> a
     1:1:com.android.tools.r8.graph.proto.RewrittenTypeInfo$Builder setNewType(com.android.tools.r8.graph.DexType):150:150 -> b
     1:1:com.android.tools.r8.graph.proto.RewrittenTypeInfo$Builder setOldType(com.android.tools.r8.graph.DexType):145:145 -> c
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.Ha:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger -> com.android.tools.r8.internal.Ka:
     com.android.tools.r8.graph.DexEncodedField[] merge() -> a
     void setClassIdField(com.android.tools.r8.graph.DexEncodedField) -> a
     1:15:void mapFields(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.BiConsumer):69:83 -> a
@@ -38916,21 +39037,21 @@
     45:47:java.util.Map getAvailableFieldsByRelaxedInfo(com.android.tools.r8.graph.AppView,java.util.Map):118:120 -> a
     48:48:void lambda$getAvailableFieldsByRelaxedInfo$2(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo,java.util.LinkedList):124:124 -> a
     49:52:void lambda$getAvailableFieldsByRelaxedInfo$2(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo,java.util.LinkedList):123:126 -> a
-    53:53:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    53:53:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     53:53:com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger create(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup):34 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    54:54:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    54:54:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     54:54:com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger create(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup):34 -> a
     55:59:com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger create(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup):35:39 -> a
     1:1:java.util.LinkedList lambda$getAvailableFieldsByRelaxedInfo$1(com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo):125:125 -> b
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$1 -> com.android.tools.r8.internal.Ea:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$1 -> com.android.tools.r8.internal.Ha:
     1:1:void <init>():39:39 -> <init>
     1:1:void setClassIdField(com.android.tools.r8.graph.DexEncodedField):42:42 -> a
     2:2:com.android.tools.r8.graph.DexEncodedField[] merge():47:47 -> a
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$2 -> com.android.tools.r8.internal.Fa:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$2 -> com.android.tools.r8.internal.Ia:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():37:37 -> <clinit>
-com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$ClassInstanceFieldsMergerImpl -> com.android.tools.r8.internal.Ga:
+com.android.tools.r8.horizontalclassmerging.ClassInstanceFieldsMerger$ClassInstanceFieldsMergerImpl -> com.android.tools.r8.internal.Ja:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> c
@@ -38993,7 +39114,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> c
     2:2:boolean lambda$fixAccessFlags$2(com.android.tools.r8.graph.DexEncodedField):200 -> c
-com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.Ma:
+com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.Pa:
     com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder classMethodsBuilder -> f
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
@@ -39051,12 +39172,12 @@
     79:79:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():220:220 -> a
     79:79:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):305 -> a
     79:79:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
-    80:80:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    80:80:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     80:80:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():220 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     80:80:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):305 -> a
     80:80:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
-    81:81:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    81:81:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     81:81:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():220 -> a
     81:81:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeFields(com.android.tools.r8.graph.PrunedItems$Builder):305 -> a
     81:81:void mergeGroup(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder,java.util.function.Consumer):336 -> a
@@ -39096,9 +39217,9 @@
     26:26:void fixAccessFlags():248:248 -> b
     27:29:void lambda$mergeInstanceFields$11(com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.graph.DexProgramClass):314:316 -> b
     1:1:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):152:152 -> c
-    2:2:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):282:282 -> c
+    2:2:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):286:286 -> c
     2:2:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):152 -> c
-    3:3:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):282:282 -> c
+    3:3:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):286:286 -> c
     3:3:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):152 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):172:172 -> c
@@ -39112,11 +39233,11 @@
     22:22:void com.android.tools.r8.graph.DexTypeList.<init>(java.util.Collection):47:47 -> e
     22:22:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.create(java.util.Collection):55 -> e
     22:22:void mergeInterfaces():300 -> e
-    23:23:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):194:194 -> e
+    23:23:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):199:199 -> e
     23:23:void mergeInterfaces():300 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:3:void mergeStaticFields():322:324 -> f
-com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.La:
+com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.Oa:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> b
     boolean $assertionsDisabled -> e
@@ -39126,11 +39247,11 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):352:356 -> <init>
     1:1:java.util.List com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createVirtualMethodMergers():360:360 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):402 -> a
-    2:2:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    2:2:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     2:2:java.util.List com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createVirtualMethodMergers():360 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):402 -> a
-    3:3:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    3:3:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     3:3:java.util.List com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createVirtualMethodMergers():360 -> a
     3:3:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):402 -> a
     4:15:java.util.List com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder.createVirtualMethodMergers():361:372 -> a
@@ -39145,16 +39266,16 @@
     26:26:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):412:412 -> a
     27:29:java.util.Map getVirtualMethodMergerBuilders():378:380 -> a
     30:30:void lambda$getVirtualMethodMergerBuilders$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):382:382 -> a
-    31:31:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> a
+    31:31:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> a
     31:31:void lambda$getVirtualMethodMergerBuilders$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):382 -> a
-    32:32:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> a
+    32:32:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> a
     32:32:void lambda$getVirtualMethodMergerBuilders$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass):382 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:33:void lambda$getVirtualMethodMergerBuilders$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):386:386 -> a
     34:37:void lambda$getVirtualMethodMergerBuilders$1(java.util.Map,com.android.tools.r8.graph.ProgramMethod):385:388 -> a
     38:38:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$getVirtualMethodMergerBuilders$0(com.android.tools.r8.graph.DexMethodSignature):387:387 -> a
     39:39:boolean lambda$build$3(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):406:406 -> a
-com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.Na:
+com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.Qa:
     java.util.List virtualMethods -> b
     java.util.List directMethods -> c
     java.util.Set reservedMethods -> a
@@ -39167,7 +39288,7 @@
     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.mb:
+com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.pb:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> c
@@ -39183,7 +39304,7 @@
     20:22:void addField(com.android.tools.r8.graph.DexEncodedField):56:58 -> a
     23:23:void addFields(com.android.tools.r8.graph.DexProgramClass):62:62 -> a
     24:24:void merge():66:66 -> a
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.qe:
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.te:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexField classIdField -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> m
@@ -39216,7 +39337,7 @@
     2:2:boolean com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint.hasClassIdField():53:53 -> k
     2:2:void prepareSingleConstructorInstructions():126 -> k
     3:6:void prepareSingleConstructorInstructions():127:130 -> k
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.Fn:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.Kn:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> b
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> c
@@ -39231,10 +39352,10 @@
     107:107:void runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):86:86 -> a
     108:108:void runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):86:86 -> a
     90:92:void runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):86:88 -> a
-    93:93:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    93:93:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     93:93:void runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):88 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    94:94:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    94:94:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     94:94:void runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):88 -> a
     95:95:void runIfNecessary(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):89:89 -> a
     96:96:com.android.tools.r8.horizontalclassmerging.IRCodeProvider com.android.tools.r8.horizontalclassmerging.IRCodeProvider.create(com.android.tools.r8.graph.AppView):22:22 -> a
@@ -39266,10 +39387,10 @@
     178:178:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):507:507 -> a
     178:178:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):160 -> a
     179:179:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):161:161 -> a
-    180:180:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    180:180:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     180:180:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):161 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    181:181:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    181:181:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     181:181:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):161 -> a
     182:184:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):161:163 -> a
     185:200:void run(com.android.tools.r8.shaking.RuntimeTypeCheckInfo,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):162:177 -> a
@@ -39284,10 +39405,10 @@
     276:276:boolean lambda$createFieldAccessInfoCollectionModifier$3(com.android.tools.r8.graph.DexEncodedMethod):240:240 -> a
     277:277:void lambda$createFieldAccessInfoCollectionModifier$4(com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):241:241 -> a
     278:278:void transformIncompleteCode(java.util.Collection,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.concurrent.ExecutorService):256:256 -> a
-    279:279:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    279:279:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     279:279:void transformIncompleteCode(java.util.Collection,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.concurrent.ExecutorService):256 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    280:280:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    280:280:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     280:280:void transformIncompleteCode(java.util.Collection,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.concurrent.ExecutorService):256 -> a
     281:284:void transformIncompleteCode(java.util.Collection,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,java.util.concurrent.ExecutorService):257:260 -> a
     285:286:void lambda$transformIncompleteCode$9(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens,com.android.tools.r8.horizontalclassmerging.MergeGroup):263:264 -> a
@@ -39300,10 +39421,10 @@
     313:313:boolean lambda$getNewApplication$12(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.graph.DexProgramClass):310:310 -> a
     314:326:java.util.List getInitialGroups():316:328 -> a
     327:331:boolean verifyNoCyclesInInterfaceHierarchies(com.android.tools.r8.graph.AppView,java.util.Collection):384:388 -> a
-    332:332:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    332:332:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     332:332:boolean verifyNoCyclesInInterfaceHierarchies(com.android.tools.r8.graph.AppView,java.util.Collection):388 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    333:333:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    333:333:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     333:333:boolean verifyNoCyclesInInterfaceHierarchies(com.android.tools.r8.graph.AppView,java.util.Collection):388 -> a
     334:339:boolean verifyNoCyclesInInterfaceHierarchies(com.android.tools.r8.graph.AppView,java.util.Collection):388:393 -> a
     340:340:com.android.tools.r8.utils.TraversalContinuation lambda$verifyNoCyclesInInterfaceHierarchies$13(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):396:396 -> a
@@ -39319,14 +39440,14 @@
     1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger createForInitialClassMerging(com.android.tools.r8.graph.AppView):64:64 -> c
     2:3:boolean lambda$transformIncompleteCode$7(com.android.tools.r8.graph.DexEncodedMethod):266:267 -> c
     1:2:boolean lambda$verifyNoIncompleteCode$10(com.android.tools.r8.graph.DexEncodedMethod):290:291 -> d
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode -> com.android.tools.r8.internal.En:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode -> com.android.tools.r8.internal.Jn:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode INITIAL -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode FINAL -> c
     1:2:void <clinit>():40:41 -> <clinit>
     1:1:void <init>(java.lang.String,int):39:39 -> <init>
     1:1:boolean isFinal():48:48 -> a
     1:1:boolean isInitial():44:44 -> b
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.Hn:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.Mn:
     java.util.Map methodExtraParameters -> n
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> o
     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.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1):30:30 -> <init>
@@ -39342,7 +39463,7 @@
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> f
     3:3:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):136 -> f
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):54 -> f
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.Gn:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.Ln:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newMethodSignatures -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newFieldSignatures -> a
     java.util.Map methodExtraParameters -> d
@@ -39392,7 +39513,7 @@
     2:2:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):172 -> c
     3:3:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean):177:177 -> c
     3:3:void moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):172 -> c
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerUtils -> com.android.tools.r8.internal.In:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerUtils -> com.android.tools.r8.internal.Nn:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:4:boolean isClassIdField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):14:17 -> a
@@ -39402,7 +39523,7 @@
     7:7:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexField):181:181 -> a
     7:7:boolean isClassIdField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):19 -> a
     8:8:boolean isClassIdField(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):19:19 -> a
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.Kn:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.Pn:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
@@ -39445,7 +39566,7 @@
     2:2:boolean hasBeenMergedOrIsMergeTarget(com.android.tools.r8.graph.DexType):89:89 -> d
     1:1:boolean isEmpty():80:80 -> e
     2:2:boolean isMergeTarget(com.android.tools.r8.graph.DexType):85:85 -> e
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.Jn:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.On:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap mergedClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():107:107 -> <clinit>
@@ -39455,14 +39576,14 @@
     4:4:void lambda$addMergeGroup$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.DexProgramClass):118:118 -> a
     5:5:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder addMergeGroups(java.lang.Iterable):122:122 -> a
     6:6:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses build():127:127 -> a
-com.android.tools.r8.horizontalclassmerging.IRCodeProvider -> com.android.tools.r8.internal.lo:
+com.android.tools.r8.horizontalclassmerging.IRCodeProvider -> com.android.tools.r8.internal.qo:
     com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod) -> a
     void setGraphLens(com.android.tools.r8.graph.GraphLens) -> a
-com.android.tools.r8.horizontalclassmerging.IRCodeProvider$1 -> com.android.tools.r8.internal.jo:
+com.android.tools.r8.horizontalclassmerging.IRCodeProvider$1 -> com.android.tools.r8.internal.oo:
     1:1:void <init>():26:26 -> <init>
     void setGraphLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod):29:29 -> a
-com.android.tools.r8.horizontalclassmerging.IRCodeProvider$IRCodeProviderImpl -> com.android.tools.r8.internal.ko:
+com.android.tools.r8.horizontalclassmerging.IRCodeProvider$IRCodeProviderImpl -> com.android.tools.r8.internal.po:
     com.android.tools.r8.graph.AppView appViewForConversion -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider$1):37:37 -> <init>
     2:11:void <init>(com.android.tools.r8.graph.AppView):41:50 -> <init>
@@ -39472,7 +39593,7 @@
     4:4:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.Code.buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):23:23 -> a
     4:4:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod):61 -> a
     5:5:void setGraphLens(com.android.tools.r8.graph.GraphLens):66:66 -> a
-com.android.tools.r8.horizontalclassmerging.IncompleteHorizontalClassMergerCode -> com.android.tools.r8.internal.Op:
+com.android.tools.r8.horizontalclassmerging.IncompleteHorizontalClassMergerCode -> com.android.tools.r8.internal.Tp:
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens) -> a
     1:1: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):46:46 -> a
@@ -39484,7 +39605,7 @@
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():61:61 -> p0
     boolean isHorizontalClassMergerCode() -> v0
     boolean isIncompleteHorizontalClassMergerCode() -> w0
-com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode -> com.android.tools.r8.internal.Qp:
+com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode -> com.android.tools.r8.internal.Vp:
     com.android.tools.r8.graph.DexMethod parentConstructor -> j
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexMethod syntheticMethodReference -> g
@@ -39544,11 +39665,11 @@
     181:189:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):263:271 -> a
     190:190:int addCfInstructionsForInitializationInfo(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo,int[],com.android.tools.r8.graph.DexType):270:270 -> a
     1:1:java.lang.String toString():278:278 -> toString
-com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode$1 -> com.android.tools.r8.internal.Pp:
+com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode$1 -> com.android.tools.r8.internal.Up:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens val$lens -> n
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode,com.android.tools.r8.graph.DexType,int,int,java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):180:180 -> <init>
     1:1:com.android.tools.r8.graph.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):184:184 -> a
-com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode -> com.android.tools.r8.internal.Sp:
+com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode -> com.android.tools.r8.internal.Xp:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> e
     com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$SuperMethodReference superMethod -> g
     com.android.tools.r8.graph.DexMethod originalMethod -> f
@@ -39582,11 +39703,11 @@
     73:82:com.android.tools.r8.graph.CfCode toCfCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):147:156 -> a
     83:95:com.android.tools.r8.cf.code.CfFrame createCfFrameForSwitchCase(com.android.tools.r8.graph.ProgramMethod,int):167:179 -> a
     1:1:java.lang.String toString():185:185 -> toString
-com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode$1 -> com.android.tools.r8.internal.Rp:
+com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode$1 -> com.android.tools.r8.internal.Wp:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens val$lens -> n
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.IncompleteVirtuallyMergedMethodCode,com.android.tools.r8.graph.DexType,int,int,java.util.List,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens):156:156 -> <init>
     1:1:com.android.tools.r8.graph.GraphLens getCodeLens(com.android.tools.r8.graph.AppView):160:160 -> a
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis -> com.android.tools.r8.internal.Uq:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerAnalysis -> com.android.tools.r8.internal.Zq:
     1:1:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription.builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):61:61 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):44 -> a
     2:73:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.graph.ProgramMethod):45:116 -> a
@@ -39606,7 +39727,7 @@
     235:235:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     235:235:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):171 -> a
     236:237:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInitializationInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):173:174 -> a
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription -> com.android.tools.r8.internal.Wq:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription -> com.android.tools.r8.internal.br:
     java.util.Map instanceFieldAssignmentsPre -> a
     java.util.Map instanceFieldAssignmentsPost -> b
     com.android.tools.r8.graph.DexTypeList relaxedParameters -> e
@@ -39616,7 +39737,7 @@
     1:2:com.android.tools.r8.horizontalclassmerging.IncompleteMergedInstanceInitializerCode createCfCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.horizontalclassmerging.MergeGroup,boolean,int):78:79 -> a
     1:8:boolean equals(java.lang.Object):91:98 -> equals
     1:1:int hashCode():103:103 -> hashCode
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder -> com.android.tools.r8.internal.Vq:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription$Builder -> com.android.tools.r8.internal.ar:
     java.util.Map instanceFieldAssignmentsPre -> c
     java.util.Map instanceFieldAssignmentsPost -> d
     java.util.List parentConstructorArguments -> f
@@ -39632,7 +39753,7 @@
     21:23:boolean addInvokeConstructor(com.android.tools.r8.graph.DexMethod,java.util.List):156:158 -> a
     24:25:com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription build():165:166 -> a
     1:1:boolean isValid():175:175 -> b
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger -> com.android.tools.r8.internal.ar:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger -> com.android.tools.r8.internal.fr:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> g
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -39743,7 +39864,7 @@
     179:179:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder):384:384 -> a
     1:1:java.util.List getInstanceInitializers():90:90 -> b
     1:1:int size():165:165 -> c
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder -> com.android.tools.r8.internal.Zq:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder -> com.android.tools.r8.internal.er:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> f
     java.util.List instanceInitializerGroups -> d
@@ -39756,10 +39877,10 @@
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):173:186 -> <init>
     1:2:void createNewGroup():190:191 -> a
     3:6:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):196:199 -> a
-    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():343:343 -> a
+    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():344:344 -> a
     7:7:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):199 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():343:343 -> a
+    8:8:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():344:344 -> a
     8:8:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):199 -> a
     9:15:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):199:205 -> a
     16:17:java.util.List build(com.android.tools.r8.horizontalclassmerging.MergeGroup):215:216 -> a
@@ -39768,7 +39889,7 @@
     19:19:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger lambda$build$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.util.List):219 -> a
     20:23:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger buildSingle(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.InstanceInitializerDescription):225:228 -> a
     1:1:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMerger$Builder addEquivalent(com.android.tools.r8.graph.ProgramMethod):210:210 -> b
-com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection -> com.android.tools.r8.internal.br:
+com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection -> com.android.tools.r8.internal.gr:
     java.util.List instanceInitializerMergers -> a
     java.util.Map equivalentInstanceInitializerMergers -> b
     boolean $assertionsDisabled -> c
@@ -39785,14 +39906,14 @@
     37:37:boolean verifyNoInstanceInitializers(com.android.tools.r8.horizontalclassmerging.MergeGroup):133:133 -> a
     38:38:void lambda$verifyNoInstanceInitializers$7(com.android.tools.r8.graph.DexProgramClass):135:135 -> a
     39:40:void forEach(java.util.function.Consumer):141:142 -> a
-    41:41:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    41:41:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     41:41:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):47 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    42:42:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    42:42:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     42:42:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):47 -> a
     43:122:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):48:127 -> a
     123:125:com.android.tools.r8.horizontalclassmerging.InstanceInitializerMergerCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):126:128 -> a
-com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.VF:
+com.android.tools.r8.horizontalclassmerging.MergeGroup -> com.android.tools.r8.internal.cG:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap instanceFieldMap -> e
     com.android.tools.r8.graph.DexProgramClass target -> d
     boolean $assertionsDisabled -> f
@@ -39838,11 +39959,11 @@
     7:7:java.lang.Object com.android.tools.r8.utils.IterableUtils.first(java.lang.Iterable):77:77 -> b
     7:7:void selectTarget(com.android.tools.r8.graph.AppView):176 -> b
     8:18:void selectTarget(com.android.tools.r8.graph.AppView):176:186 -> b
-    19:19:int com.android.tools.r8.graph.DexString.size():44:44 -> b
+    19:19:int com.android.tools.r8.graph.DexString.size():48:48 -> b
     19:19:void selectTarget(com.android.tools.r8.graph.AppView):186 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:void selectTarget(com.android.tools.r8.graph.AppView):186:186 -> b
-    21:21:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> b
+    21:21:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> b
     21:21:void selectTarget(com.android.tools.r8.graph.AppView):190 -> b
     22:22:void selectTarget(com.android.tools.r8.graph.AppView):190:190 -> b
     23:24:void com.android.tools.r8.horizontalclassmerging.MergeGroup.setTarget(com.android.tools.r8.graph.DexProgramClass):194:195 -> b
@@ -39884,23 +40005,23 @@
     1:1:int size():228:228 -> size
     1:1:java.lang.Object[] toArray():261:261 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):266:266 -> toArray
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.MH:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.TH:
     1:1:void <init>():9:9 -> <init>
     java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup) -> a
     com.android.tools.r8.horizontalclassmerging.MultiClassPolicy asMultiClassPolicy() -> a
     boolean isMultiClassPolicy() -> g
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing -> com.android.tools.r8.internal.NH:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing -> com.android.tools.r8.internal.UH:
     1:1:void <init>():11:11 -> <init>
     java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup,java.lang.Object) -> a
     java.lang.Object preprocess(java.util.Collection,java.util.concurrent.ExecutorService) -> a
     com.android.tools.r8.horizontalclassmerging.MultiClassPolicyWithPreprocessing asMultiClassPolicyWithPreprocessing() -> b
     boolean isMultiClassPolicyWithPreprocessing() -> h
-com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.OH:
+com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.VH:
     1:1:void <init>():12:12 -> <init>
     java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass) -> a
     1:9:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):16:24 -> a
     10:10:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$0(java.lang.Object):20:20 -> a
-com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.aO:
+com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.sO:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -39920,7 +40041,7 @@
     boolean isMultiClassPolicyWithPreprocessing() -> h
     boolean isSingleClassPolicy() -> i
     boolean shouldSkipPolicy() -> j
-com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.bO:
+com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.tO:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:8:void applySingleClassPolicy(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,java.util.LinkedList):23:30 -> a
@@ -39939,16 +40060,16 @@
     1:1:void lambda$applyMultiClassPolicyWithPreprocessing$3(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.MergeGroup):67:67 -> b
     2:2:void com.android.tools.r8.horizontalclassmerging.MergeGroup.applyMetadataFrom(com.android.tools.r8.horizontalclassmerging.MergeGroup):58:58 -> b
     2:2:void lambda$applyMultiClassPolicyWithPreprocessing$3(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.horizontalclassmerging.MergeGroup):67 -> b
-com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools.r8.internal.cO:
+com.android.tools.r8.horizontalclassmerging.PolicyScheduler -> com.android.tools.r8.internal.uO:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():67:67 -> <clinit>
     1:3:boolean verifyMultiClassPoliciesIrrelevantForMergingSyntheticsInD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):310:312 -> a
     4:10:boolean verifyPolicyOrderingConstraints(java.util.List):321:327 -> a
     11:11:boolean lambda$verifyPolicyOrderingConstraints$0(com.android.tools.r8.horizontalclassmerging.Policy):323:323 -> a
-    12:12:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    12:12:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     12:12:java.util.List getPolicies(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):74 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    13:13:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     13:13:java.util.List getPolicies(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):74 -> a
     14:14:java.util.List getPolicies(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):76:76 -> a
     15:15:java.util.List com.android.tools.r8.horizontalclassmerging.PolicyScheduler.getPoliciesForR8(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.IRCodeProvider,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):100:100 -> a
@@ -40019,12 +40140,12 @@
     2:2:void com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):22:22 -> c
     2:2:boolean verifySingleClassPoliciesIrrelevantForMergingSyntheticsInD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):197 -> c
     3:12:boolean verifySingleClassPoliciesIrrelevantForMergingSyntheticsInD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):197:206 -> c
-com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.oX:
+com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.JX:
     1:1:void <init>():9:9 -> <init>
     boolean canMerge(com.android.tools.r8.graph.DexProgramClass) -> a
     com.android.tools.r8.horizontalclassmerging.SingleClassPolicy asSingleClassPolicy() -> c
     boolean isSingleClassPolicy() -> i
-com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.a00:
+com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.v00:
     java.util.Map subtypeMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Collection roots -> b
@@ -40054,12 +40175,12 @@
     3:3:java.util.Collection com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.getSubtypesFor(com.android.tools.r8.graph.DexProgramClass):68:68 -> b
     3:3:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74 -> b
     4:4:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74:74 -> b
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.t00:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.O00:
     java.util.List syntheticClassTypes -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1):33:33 -> <init>
     2:3:void <init>(java.util.List):37:38 -> <init>
     1:1:java.util.List getArgumentClasses():42:42 -> a
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.s00:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.N00:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():45:45 -> <clinit>
@@ -40075,7 +40196,7 @@
     19:21:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(java.util.Collection):67:69 -> a
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$build$2(com.android.tools.r8.synthesis.SyntheticNaming):66:66 -> b
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$build$3(com.android.tools.r8.synthesis.SyntheticNaming):68:68 -> c
-com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.G10:
+com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.c20:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> g
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> i
@@ -40150,10 +40271,10 @@
     1:13:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens fixupTypeReferences():125:137 -> b
     14:17:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):143:146 -> b
     18:26:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):145:153 -> b
-    27:27:com.android.tools.r8.graph.NestHostClassAttribute com.android.tools.r8.graph.TreeFixerBase.fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):253:253 -> b
+    27:27:com.android.tools.r8.graph.NestHostClassAttribute com.android.tools.r8.graph.TreeFixerBase.fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):254:254 -> b
     27:27:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):153 -> b
     28:29:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):153:154 -> b
-    30:39:java.util.List com.android.tools.r8.graph.TreeFixerBase.fixupNestMemberAttributes(java.util.List):259:268 -> b
+    30:39:java.util.List com.android.tools.r8.graph.TreeFixerBase.fixupNestMemberAttributes(java.util.List):260:269 -> b
     30:39:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):154 -> b
     40:40:void fixupAttributes(com.android.tools.r8.graph.DexProgramClass):154:154 -> b
     41:41: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):180:180 -> b
@@ -40182,9 +40303,9 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$1(java.util.Set,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):183:183 -> c
     2:14:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):234:246 -> c
     1:6:void fixupProgramClassSuperTypes(com.android.tools.r8.graph.DexProgramClass):158:163 -> d
-    7:7:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):194:194 -> d
+    7:7:void com.android.tools.r8.graph.DexClass.setInterfaces(com.android.tools.r8.graph.DexTypeList):199:199 -> d
     7:7:void fixupProgramClassSuperTypes(com.android.tools.r8.graph.DexProgramClass):163 -> d
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.X40:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.t50:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$SuperMethodReference superMethod -> e
     com.android.tools.r8.graph.AppView appView -> a
@@ -40262,7 +40383,7 @@
     13:17:boolean isTrivial():190 -> d
     1:1:boolean lambda$getAccessFlags$4(com.android.tools.r8.graph.MethodAccessFlags):154:154 -> e
     1:1:boolean lambda$getAccessFlags$5(com.android.tools.r8.graph.MethodAccessFlags):157:157 -> f
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.V40:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.r50:
     java.util.List methods -> a
     1:2:void <init>():67:68 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):71:71 -> a
@@ -40270,11 +40391,11 @@
     3:21:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$SuperMethodReference com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):78:96 -> a
     3:21:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):103 -> a
     22:22:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.MergeGroup):104:104 -> a
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$SuperMethodReference -> com.android.tools.r8.internal.W40:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$SuperMethodReference -> com.android.tools.r8.internal.s50:
     com.android.tools.r8.graph.DexMethod reboundReference -> b
     com.android.tools.r8.graph.DexMethod reference -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):35:37 -> <init>
-com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo -> com.android.tools.r8.internal.a50:
+com.android.tools.r8.horizontalclassmerging.VirtuallyMergedMethodsKeepInfo -> com.android.tools.r8.internal.w50:
     com.android.tools.r8.shaking.KeepMethodInfo$Joiner keepInfo -> b
     com.android.tools.r8.graph.DexMethod representative -> a
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):16:16 -> <init>
@@ -40282,7 +40403,7 @@
     1:1:void amendKeepInfo(com.android.tools.r8.shaking.KeepMethodInfo):21:21 -> a
     2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner getKeepInfo():29:29 -> a
     1:1:com.android.tools.r8.graph.DexMethod getRepresentative():25:25 -> b
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.android.tools.r8.internal.ua:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger -> com.android.tools.r8.internal.xa:
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():54:54 -> <clinit>
@@ -40301,14 +40422,14 @@
     39:39:com.android.tools.r8.androidapi.ComputedApiLevel lambda$getApiReferenceLevel$3(com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.ProgramMethod):108:108 -> a
     1:1:boolean isEmpty():74:74 -> b
     2:2:java.lang.Boolean lambda$getCode$1(com.android.tools.r8.graph.ProgramMethod):83:83 -> b
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.ra:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$Builder -> com.android.tools.r8.internal.ua:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder classInitializers -> a
     1:1:void <clinit>():111:111 -> <clinit>
     1:3:void <init>():111:113 -> <init>
     1:3:void add(com.android.tools.r8.graph.ProgramMethod):116:118 -> a
     4:4:com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger build():122:122 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder -> com.android.tools.r8.internal.sa:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder -> com.android.tools.r8.internal.va:
     com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger this$0 -> c
     int maxLocals -> b
     int maxStack -> a
@@ -40325,7 +40446,7 @@
     18:22:void lambda$buildInstructions$0(java.util.List,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):145 -> a
     23:38:void com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$CfCodeBuilder.addCfCode(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):161:176 -> a
     23:38:void lambda$buildInstructions$0(java.util.List,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.ProgramMethod):145 -> a
-com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.ta:
+com.android.tools.r8.horizontalclassmerging.code.ClassInitializerMerger$IRProvider -> com.android.tools.r8.internal.wa:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexMethod syntheticMethodReference -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList classInitializers -> d
@@ -40351,7 +40472,7 @@
     1:1:int computeHashCode():280:280 -> l0
     1:1:int estimatedDexCodeSizeUpperBoundInBytes():290:290 -> p0
     1:1:java.lang.String toString():310:310 -> toString
-com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.re:
+com.android.tools.r8.horizontalclassmerging.code.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.ue:
     com.android.tools.r8.graph.DexField classIdField -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> g
     com.android.tools.r8.graph.DexMethod originalMethod -> e
@@ -40370,7 +40491,7 @@
     9:9:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):49 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():35:35 -> z0
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.z00:
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter -> com.android.tools.r8.internal.U00:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List classInitializers -> d
     java.util.Set instanceInitializers -> e
@@ -40389,7 +40510,7 @@
     9:13:com.android.tools.r8.graph.AppView com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter.createAppViewForConversion():95:99 -> a
     9:13:void convertClassInitializers(java.util.concurrent.ExecutorService):60 -> a
     14:14:void convertClassInitializers(java.util.concurrent.ExecutorService):60:60 -> a
-    15:15:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):305:305 -> a
+    15:15:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):312:312 -> a
     15:15:void convertClassInitializers(java.util.concurrent.ExecutorService):60 -> a
     16:16:void convertClassInitializers(java.util.concurrent.ExecutorService):61:61 -> a
     17:17:void lambda$convertInstanceInitializers$1(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass):72:72 -> a
@@ -40407,7 +40528,7 @@
     8:12:com.android.tools.r8.graph.AppView com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter.createAppViewForConversion():95:99 -> b
     8:12:void convertInstanceInitializers(java.util.concurrent.ExecutorService):69 -> b
     13:13:void convertInstanceInitializers(java.util.concurrent.ExecutorService):69:69 -> b
-    14:14:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):305:305 -> b
+    14:14:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):312:312 -> b
     14:14:void convertInstanceInitializers(java.util.concurrent.ExecutorService):69 -> b
     15:15:void convertInstanceInitializers(java.util.concurrent.ExecutorService):70:70 -> b
     16:18:void processInstanceInitializers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.conversion.IRConverter):78:80 -> b
@@ -40416,7 +40537,7 @@
     22:22:void com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter.processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):105:105 -> b
     22:22:void lambda$processInstanceInitializers$3(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):83 -> b
     23:23:void lambda$processInstanceInitializers$3(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ProgramMethod):84:84 -> b
-com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder -> com.android.tools.r8.internal.y00:
+com.android.tools.r8.horizontalclassmerging.code.SyntheticInitializerConverter$Builder -> com.android.tools.r8.internal.T00:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List classInitializers -> d
     java.util.Set instanceInitializers -> e
@@ -40436,19 +40557,19 @@
     1:1:java.lang.Boolean com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstantiated.getMergeKey(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():32:32 -> e
-com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses -> com.android.tools.r8.internal.F9:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses -> com.android.tools.r8.internal.I9:
     com.android.tools.r8.utils.InternalOptions options -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):22:23 -> <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):40:42 -> a
     1:3:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():28:28 -> e
     1:1:boolean shouldSkipPolicy():35:35 -> j
-com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.E9:
+com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification -> com.android.tools.r8.internal.H9:
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification NOT_ABSTRACT -> c
     com.android.tools.r8.horizontalclassmerging.policies.CheckAbstractClasses$AbstractClassification ABSTRACT -> b
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.CheckSyntheticClasses -> com.android.tools.r8.internal.U9:
+com.android.tools.r8.horizontalclassmerging.policies.CheckSyntheticClasses -> com.android.tools.r8.internal.X9:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> c
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView):18:20 -> <init>
@@ -40460,7 +40581,7 @@
     3:3:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25 -> a
     4:5:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):28:29 -> a
     1:1:java.lang.String getName():37:37 -> e
-com.android.tools.r8.horizontalclassmerging.policies.ComputeApiLevelOfSyntheticClass -> com.android.tools.r8.internal.bd:
+com.android.tools.r8.horizontalclassmerging.policies.ComputeApiLevelOfSyntheticClass -> com.android.tools.r8.internal.ed:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> d
@@ -40478,7 +40599,7 @@
     10:10:void lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):44 -> a
     11:14:void lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):45:48 -> a
     1:1:java.lang.String getName():56:56 -> e
-com.android.tools.r8.horizontalclassmerging.policies.ComputeApiLevelOfSyntheticClass$ComputeApiLevelUseRegistry -> com.android.tools.r8.internal.ad:
+com.android.tools.r8.horizontalclassmerging.policies.ComputeApiLevelOfSyntheticClass$ComputeApiLevelUseRegistry -> com.android.tools.r8.internal.dd:
     com.android.tools.r8.graph.AppView appView -> e
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> f
     boolean $assertionsDisabled -> h
@@ -40513,7 +40634,7 @@
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):85:85 -> g
     2:2:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):145:145 -> g
     1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):150:150 -> h
-com.android.tools.r8.horizontalclassmerging.policies.FinalizeMergeGroup -> com.android.tools.r8.internal.el:
+com.android.tools.r8.horizontalclassmerging.policies.FinalizeMergeGroup -> com.android.tools.r8.internal.jl:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> c
     boolean $assertionsDisabled -> d
@@ -40528,7 +40649,7 @@
     25:26:void lambda$verifyAlreadyFinalized$2(java.util.Set,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):77:78 -> a
     1:9:boolean verifyAlreadyFinalized(com.android.tools.r8.horizontalclassmerging.MergeGroup):67:75 -> b
     1:1:java.lang.String getName():58:58 -> e
-com.android.tools.r8.horizontalclassmerging.policies.LimitClassGroups -> com.android.tools.r8.internal.oD:
+com.android.tools.r8.horizontalclassmerging.policies.LimitClassGroups -> com.android.tools.r8.internal.uD:
     int maxGroupSize -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():15:15 -> <clinit>
@@ -40543,7 +40664,7 @@
     20:20:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):30:30 -> a
     1:1:java.lang.String getName():60:60 -> e
     boolean isIdentityForInterfaceGroups() -> f
-com.android.tools.r8.horizontalclassmerging.policies.LimitInterfaceGroups -> com.android.tools.r8.internal.pD:
+com.android.tools.r8.horizontalclassmerging.policies.LimitInterfaceGroups -> com.android.tools.r8.internal.vD:
     int maxGroupSize -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):22:23 -> <init>
     1:6:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):29:34 -> a
@@ -40556,7 +40677,7 @@
     25:25:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):35 -> a
     26:26:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):37:37 -> a
     1:1:java.lang.String getName():61:61 -> e
-com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts -> com.android.tools.r8.internal.SG:
+com.android.tools.r8.horizontalclassmerging.policies.MinimizeInstanceFieldCasts -> com.android.tools.r8.internal.ZG:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -40568,20 +40689,20 @@
     42:42:void addExact(com.android.tools.r8.graph.DexProgramClass,java.util.Map):63:63 -> a
     1:1:void lambda$apply$0(java.util.Map,com.android.tools.r8.graph.DexProgramClass):26:26 -> b
     1:1:java.lang.String getName():76:76 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.FI:
+com.android.tools.r8.horizontalclassmerging.policies.NoAnnotationClasses -> com.android.tools.r8.internal.MI:
     1:1:void <init>():10:10 -> <init>
-    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    2:2:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():18:18 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoCheckDiscard -> com.android.tools.r8.internal.GI:
+com.android.tools.r8.horizontalclassmerging.policies.NoCheckDiscard -> com.android.tools.r8.internal.NI:
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView):19:21 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26:26 -> a
     1:1:java.lang.String getName():31:31 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.HI:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassAnnotationCollisions -> com.android.tools.r8.internal.OI:
     1:1:void com.android.tools.r8.horizontalclassmerging.policies.AtMostOneClassThatMatchesPolicy.<init>():18:18 -> <init>
     1:1:void <init>():9 -> <init>
     1:2:java.util.Collection com.android.tools.r8.horizontalclassmerging.policies.AtMostOneClassThatMatchesPolicy.apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):23:24 -> a
@@ -40609,7 +40730,7 @@
     21:24:java.util.Collection com.android.tools.r8.horizontalclassmerging.policies.AtMostOneClassThatMatchesPolicy.apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.lang.String getName():18:18 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles -> com.android.tools.r8.internal.KI:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles -> com.android.tools.r8.internal.RI:
     java.util.Map allGroups -> c
     com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation singleCallerInformation -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -40660,7 +40781,7 @@
     1:1:void clear():265:265 -> d
     1:1:java.lang.String getName():270:270 -> e
     1:2:boolean shouldSkipPolicy():288:289 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer -> com.android.tools.r8.internal.JI:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer -> com.android.tools.r8.internal.QI:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles this$0 -> h
     java.util.Set seenClassInitializers -> c
@@ -40692,7 +40813,7 @@
     5:7:void trace():390 -> c
     8:9:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer.clearSeen():318:319 -> c
     8:9:void trace():391 -> c
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry -> com.android.tools.r8.internal.II:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry -> com.android.tools.r8.internal.PI:
     com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer this$1 -> e
     1:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer,com.android.tools.r8.graph.ProgramMethod):407:408 -> <init>
     void registerCheckCast(com.android.tools.r8.graph.DexType,boolean) -> a
@@ -40822,13 +40943,13 @@
     19:19:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):560 -> g
     20:20:void com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerCycles$Tracer$TracerUseRegistry.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):421:421 -> g
     20:20:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):560 -> g
-com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.LI:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassInitializerWithObservableSideEffects -> com.android.tools.r8.internal.SI:
     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
     1:1:java.lang.String getName():34:34 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoConstructorCollisions -> com.android.tools.r8.internal.MI:
+com.android.tools.r8.horizontalclassmerging.policies.NoConstructorCollisions -> com.android.tools.r8.internal.TI:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> d
@@ -40855,7 +40976,7 @@
     31:41:java.util.Set preprocess(java.util.Collection,java.util.concurrent.ExecutorService):97:107 -> b
     42:56:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.DexType,java.util.Map):129:143 -> b
     1:1:java.lang.String getName():149:149 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDeadEnumLiteMaps -> com.android.tools.r8.internal.NI:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadEnumLiteMaps -> com.android.tools.r8.internal.UI:
     java.util.Set deadEnumLiteMaps -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():17:17 -> <clinit>
@@ -40863,22 +40984,22 @@
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):26:26 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):32:32 -> a
     1:1:java.lang.String getName():37:37 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks -> com.android.tools.r8.internal.OI:
+com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks -> com.android.tools.r8.internal.VI:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):20:21 -> <init>
     1:1:boolean com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks.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:3:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1239:1240 -> a
+    2:3:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1265:1266 -> a
     2:3:boolean com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks.isSynchronizationClass(com.android.tools.r8.graph.DexProgramClass):25 -> a
     2:3:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):34 -> a
     4:4:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():442:442 -> a
-    4:4:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1240 -> a
+    4:4:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1266 -> a
     4:4:boolean com.android.tools.r8.horizontalclassmerging.policies.NoDeadLocks.isSynchronizationClass(com.android.tools.r8.graph.DexProgramClass):25 -> a
     4:4:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):34 -> a
     5:7:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):36:38 -> a
     8:32:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):31:55 -> a
     1:1:java.lang.String getName():62:62 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions -> com.android.tools.r8.internal.QI:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions -> com.android.tools.r8.internal.XI:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):79:81 -> <init>
@@ -40936,13 +41057,13 @@
     1:1:boolean lambda$computeInheritedDefaultMethodsPerProgramType$6(com.android.tools.r8.graph.DexType):265:265 -> d
     1:1:java.lang.String getName():349:349 -> e
     1:1:boolean shouldSkipPolicy():354:354 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions$InterfaceInfo -> com.android.tools.r8.internal.PI:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodCollisions$InterfaceInfo -> com.android.tools.r8.internal.WI:
     java.util.Map inheritedDefaultMethods -> a
     java.util.Map defaultMethodsInheritedBySubclasses -> b
     1:3:void <init>(java.util.Map,java.util.Map):369:371 -> <init>
     1:1:java.util.Map getDefaultMethodsInheritedBySubclasses():379:379 -> a
     1:1:java.util.Map getInheritedDefaultMethods():375:375 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging -> com.android.tools.r8.internal.RI:
+com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging -> com.android.tools.r8.internal.YI:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexType MULTIPLE_SENTINEL -> c
     boolean $assertionsDisabled -> d
@@ -41019,7 +41140,7 @@
     14:15:void com.android.tools.r8.horizontalclassmerging.policies.NoDefaultInterfaceMethodMerging.addInterfacesToWorklist(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList):142:143 -> b
     14:15:com.android.tools.r8.utils.collections.DexMethodSignatureMap collectDefaultMethodsInInterfaces(com.android.tools.r8.graph.DexProgramClass):118 -> b
     1:1:java.lang.String getName():150:150 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel -> com.android.tools.r8.internal.SI:
+com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel -> com.android.tools.r8.internal.ZI:
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> e
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> b
@@ -41028,19 +41149,19 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView):22:26 -> <init>
     1:2:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel.getMergeKey(com.android.tools.r8.graph.DexProgramClass):41:42 -> a
     1:2:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
-    3:3:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):60:60 -> a
+    3:3:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):61:61 -> a
     3:3:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel.getMergeKey(com.android.tools.r8.graph.DexProgramClass):42 -> a
     3:3:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
-    4:4:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):59:59 -> a
+    4:4:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):60:60 -> a
     4:4:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel.getMergeKey(com.android.tools.r8.graph.DexProgramClass):42 -> a
     4:4:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
-    5:9:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):68:72 -> a
-    5:9:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):57 -> a
+    5:9:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):69:73 -> a
+    5:9:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):58 -> a
     5:9:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.horizontalclassmerging.policies.NoDifferentApiReferenceLevel.getMergeKey(com.android.tools.r8.graph.DexProgramClass):42 -> a
     5:9:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):15 -> a
     1:1:java.lang.String getName():36:36 -> e
     1:1:boolean shouldSkipPolicy():31:31 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.TI:
+com.android.tools.r8.horizontalclassmerging.policies.NoDirectRuntimeTypeChecks -> com.android.tools.r8.internal.aJ:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> d
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> e
@@ -41062,7 +41183,7 @@
     43:46:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):37:40 -> a
     1:1:java.lang.String getName():45:45 -> e
     1:1:boolean shouldSkipPolicy():50:50 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.UI:
+com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.bJ:
     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>
@@ -41071,12 +41192,12 @@
     5:17:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):46:58 -> a
     1:1:void clear():26:26 -> d
     1:1:java.lang.String getName():31:31 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoFailedResolutionTargets -> com.android.tools.r8.internal.VI:
+com.android.tools.r8.horizontalclassmerging.policies.NoFailedResolutionTargets -> com.android.tools.r8.internal.cJ:
     java.util.Set failedResolutionHolders -> b
     1:4:void <init>(com.android.tools.r8.graph.AppView):21:24 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):35:35 -> a
     1:1:java.lang.String getName():30:30 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining -> com.android.tools.r8.internal.WI:
+com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining -> com.android.tools.r8.internal.dJ:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():18:18 -> <clinit>
@@ -41091,7 +41212,7 @@
     20:20:boolean com.android.tools.r8.horizontalclassmerging.policies.NoIllegalInlining.disallowInlining(com.android.tools.r8.graph.ProgramMethod):46 -> a
     20:20:boolean lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):57 -> a
     1:1:java.lang.String getName():62:62 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.XI:
+com.android.tools.r8.horizontalclassmerging.policies.NoIndirectRuntimeTypeChecks -> com.android.tools.r8.internal.eJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.RuntimeTypeCheckInfo runtimeTypeCheckInfo -> c
@@ -41117,15 +41238,15 @@
     7:13:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexTypeList.getSorted():162:168 -> b
     7:13:com.android.tools.r8.graph.DexTypeList getMergeKey(com.android.tools.r8.graph.DexProgramClass):40 -> b
     1:1:java.lang.String getName():81:81 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.YI:
+com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.fJ:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     1:1:java.lang.String getName():20:20 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.ZI:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFieldAnnotations -> com.android.tools.r8.internal.gJ:
     1:1:void <init>():11:11 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:16 -> a
     1:1:java.lang.String getName():25:25 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoInstanceInitializerMerging -> com.android.tools.r8.internal.aJ:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceInitializerMerging -> com.android.tools.r8.internal.hJ:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.horizontalclassmerging.IRCodeProvider codeProvider -> c
     boolean $assertionsDisabled -> d
@@ -41164,14 +41285,14 @@
     1:1:java.util.Optional lambda$apply$0(com.android.tools.r8.horizontalclassmerging.MergeGroup,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.graph.ProgramMethod):100:100 -> b
     1:1:java.lang.String getName():257:257 -> e
     boolean isIdentityForInterfaceGroups() -> f
-com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.bJ:
+com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.iJ:
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> b
     com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions options -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):18:20 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25:25 -> a
     1:1:java.lang.String getName():35:35 -> e
     1:1:boolean shouldSkipPolicy():30:30 -> j
-com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.cJ:
+com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.jJ:
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> c
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set dontMergeTypes -> e
@@ -41183,7 +41304,7 @@
     10:10:void processClass(com.android.tools.r8.graph.DexProgramClass):42:42 -> b
     11:19:void processClass(com.android.tools.r8.graph.DexProgramClass):40:48 -> b
     1:1:java.lang.String getName():59:59 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.dJ:
+com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.kJ:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -41193,26 +41314,26 @@
     4:4:boolean lambda$verifyNoUnexpectedKotlinMemberInfo$0(com.android.tools.r8.graph.DexEncodedMember):29:29 -> a
     1:3:boolean verifyNoUnexpectedKotlinMemberInfo(com.android.tools.r8.graph.DexProgramClass):28:28 -> b
     1:1:java.lang.String getName():35:35 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.eJ:
+com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.lJ:
     1:1:void <init>():12:12 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     2:2:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
     2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15 -> a
     1:1:java.lang.String getName():20:20 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.fJ:
+com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.mJ:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set allServiceImplementations -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView):18:20 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25:26 -> a
     1:1:java.lang.String getName():31:31 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoVerticallyMergedClasses -> com.android.tools.r8.internal.gJ:
+com.android.tools.r8.horizontalclassmerging.policies.NoVerticallyMergedClasses -> com.android.tools.r8.internal.nJ:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):16:20 -> <init>
     1:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):25:28 -> a
     1:1:java.lang.String getName():33:33 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoVirtualMethodMerging -> com.android.tools.r8.internal.hJ:
+com.android.tools.r8.horizontalclassmerging.policies.NoVirtualMethodMerging -> com.android.tools.r8.internal.oJ:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():33:33 -> <clinit>
@@ -41245,7 +41366,7 @@
     59:59:boolean hasNonAbstractDefinitionInSuperInterface(java.lang.Iterable,com.android.tools.r8.graph.ProgramMethod):118 -> a
     60:65:boolean lambda$hasNonAbstractDefinitionInSuperInterface$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):121:126 -> a
     1:1:java.lang.String getName():132:132 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NoWeakerAccessPrivileges -> com.android.tools.r8.internal.iJ:
+com.android.tools.r8.horizontalclassmerging.policies.NoWeakerAccessPrivileges -> com.android.tools.r8.internal.pJ:
     java.util.Map inheritedInterfaceMethodsCache -> d
     com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph graph -> b
     java.util.Map nonPublicVirtualMethodSignaturesCache -> e
@@ -41289,19 +41410,19 @@
     3:3:void lambda$getOrComputeNonPublicVirtualMethodSignaturesInComponent$3(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexClass):161:161 -> c
     1:3:void clear():190:192 -> d
     1:1:java.lang.String getName():197:197 -> e
-com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.FJ:
+com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.MJ:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
     1:1:java.lang.String getName():27:27 -> e
-com.android.tools.r8.horizontalclassmerging.policies.OnlyClassesWithStaticDefinitionsAndNoClassInitializer -> com.android.tools.r8.internal.EM:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyClassesWithStaticDefinitionsAndNoClassInitializer -> com.android.tools.r8.internal.VM:
     1:1:void <init>():12:12 -> <init>
     1:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):16:19 -> a
     5:5:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> a
     5:5:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):19 -> a
     6:6:boolean lambda$canMerge$0(com.android.tools.r8.graph.DexEncodedMember):19:19 -> a
     1:1:java.lang.String getName():24:24 -> e
-com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces -> com.android.tools.r8.internal.GM:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces -> com.android.tools.r8.internal.XM:
     java.util.Map committed -> d
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> e
@@ -41321,7 +41442,7 @@
     1:1:void clear():155:155 -> d
     1:1:java.lang.String getName():160:160 -> e
     1:1:boolean shouldSkipPolicy():170:170 -> j
-com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces$MergeGroupWithInfo -> com.android.tools.r8.internal.FM:
+com.android.tools.r8.horizontalclassmerging.policies.OnlyDirectlyConnectedOrUnrelatedInterfaces$MergeGroupWithInfo -> com.android.tools.r8.internal.WM:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     java.util.Set superInterfaces -> c
     java.util.Set subInterfaces -> d
@@ -41334,7 +41455,7 @@
     19:19:com.android.tools.r8.horizontalclassmerging.MergeGroup getGroup():208:208 -> a
     1:1:boolean lambda$add$1(com.android.tools.r8.graph.DexProgramClass):203:203 -> b
     2:19:boolean isSafeToAddSubAndSuperInterfaces(com.android.tools.r8.graph.DexProgramClass,java.util.Set,java.util.Set):216:233 -> b
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.CO:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics -> com.android.tools.r8.internal.UO:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():30:30 -> <clinit>
@@ -41345,29 +41466,29 @@
     6:16:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):145:155 -> a
     17:17:boolean lambda$apply$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup):143:143 -> a
     1:1:java.lang.String getName():34:34 -> e
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.AO:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics -> com.android.tools.r8.internal.SO:
     com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride -> c
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> a
     boolean isAssumeNoSideEffectsMethod -> b
     boolean isMainDexRoot -> d
     1:12:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean,boolean):45:56 -> <init>
     1:3:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):61:63 -> a
-    4:4:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):770:770 -> a
+    4:4:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
     4:4:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):63 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):770:770 -> a
+    5:5:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
     5:5:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):63 -> a
     6:6:com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$MethodCharacteristics create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):64:64 -> a
     1:5:boolean equals(java.lang.Object):81:85 -> equals
     1:6:int hashCode():69:69 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.BO:
+com.android.tools.r8.horizontalclassmerging.policies.PreserveMethodCharacteristics$TargetGroup -> com.android.tools.r8.internal.TO:
     com.android.tools.r8.horizontalclassmerging.MergeGroup group -> a
     java.util.Map methodMap -> b
     1:4:void <init>():101:104 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.MergeGroup getGroup():107:107 -> a
     2:16:boolean tryAdd(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):111:125 -> a
     17:17:boolean isSubjectToMethodMerging(com.android.tools.r8.graph.DexEncodedMethod):130:130 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions -> com.android.tools.r8.internal.KO:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions -> com.android.tools.r8.internal.cP:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache parentClassMethodsCache -> e
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor reservedInterfaceSignaturesFor -> f
@@ -41380,7 +41501,7 @@
     13:15:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions.computeReservedSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):147:149 -> a
     13:15:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):167 -> a
     16:20:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):168:172 -> a
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     21:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):66 -> a
     21:21:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):172 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
@@ -41395,44 +41516,44 @@
     1:1:com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache access$600(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):52:52 -> b
     1:1:com.android.tools.r8.graph.ImmediateProgramSubtypingInfo access$700(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):52:52 -> c
     1:1:java.lang.String getName():66:66 -> e
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DexClassSignaturesCache -> com.android.tools.r8.internal.DO:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DexClassSignaturesCache -> com.android.tools.r8.internal.VO:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> b
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):85:85 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):85:85 -> <init>
     1:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):88:89 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature -> com.android.tools.r8.internal.EO:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$DispatchSignature -> com.android.tools.r8.internal.WO:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():139:139 -> <clinit>
     1:1:void <init>():139:139 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.FO:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.XO:
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):93:93 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):93:93 -> <init>
     1:2:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):97:98 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory -> com.android.tools.r8.internal.GO:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory -> com.android.tools.r8.internal.YO:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory KEEP_ABSENT -> c
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$MethodCategory CLASS_HIERARCHY_SAFE -> b
     1:2:void <clinit>():135:136 -> <clinit>
     1:1:void <init>(java.lang.String,int):134:134 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache -> com.android.tools.r8.internal.HO:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ParentClassSignaturesCache -> com.android.tools.r8.internal.ZO:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> c
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):102:102 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):102:102 -> <init>
     1:5:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):106:110 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.IO:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.aP:
     com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions this$0 -> b
     1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions):116:116 -> <init>
     2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions,com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):116:116 -> <init>
     1:1:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):116:116 -> a
     2:2:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):121:121 -> a
     3:6:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):120:123 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$SignaturesCache -> com.android.tools.r8.internal.JO:
+com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$SignaturesCache -> com.android.tools.r8.internal.bP:
     java.util.Map memoizedSignatures -> a
     1:2:void <init>():69:70 -> <init>
     3:3:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventClassMethodAndDefaultMethodCollisions$1):69:69 -> <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):73:73 -> 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):76:77 -> a
-com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.kV:
+com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.FV:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):28:29 -> <init>
     1:11:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):34:44 -> a
@@ -41454,7 +41575,7 @@
     48:71:java.util.Collection apply(com.android.tools.r8.horizontalclassmerging.MergeGroup):98:121 -> a
     72:72:com.android.tools.r8.horizontalclassmerging.MergeGroup lambda$apply$2(java.lang.String):105:105 -> a
     1:1:java.lang.String getName():127:127 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.rW:
+com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.MW:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:4:com.android.tools.r8.FeatureSplit com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit.getMergeKey(com.android.tools.r8.graph.DexProgramClass):22:25 -> a
@@ -41463,14 +41584,14 @@
     5:5:com.android.tools.r8.FeatureSplit com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit.getMergeKey(com.android.tools.r8.graph.DexProgramClass):25 -> a
     5:5:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():30:30 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.tW:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields -> com.android.tools.r8.internal.OW:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):26:28 -> <init>
     1:9:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields.getMergeKey(com.android.tools.r8.graph.DexProgramClass):33:41 -> a
     1:9:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):21 -> a
     1:1:java.lang.String getName():48:48 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.sW:
+com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo -> com.android.tools.r8.internal.NW:
     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):56:61 -> <init>
@@ -41479,25 +41600,25 @@
     5:6:com.android.tools.r8.horizontalclassmerging.policies.SameInstanceFields$InstanceFieldInfo toInfoWithRelaxedType(com.android.tools.r8.graph.DexItemFactory):80:81 -> a
     1:5:boolean equals(java.lang.Object):86:90 -> equals
     1:1:int hashCode():95:95 -> hashCode
-com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup -> com.android.tools.r8.internal.uW:
+com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup -> com.android.tools.r8.internal.PW:
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> b
     com.android.tools.r8.synthesis.SyntheticItems synthetics -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView):19:21 -> <init>
     1:2:com.android.tools.r8.shaking.MainDexInfo$MainDexGroup com.android.tools.r8.horizontalclassmerging.policies.SameMainDexGroup.getMergeKey(com.android.tools.r8.graph.DexProgramClass):26:27 -> a
     1:2:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):14 -> a
     1:1:java.lang.String getName():33:33 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.vW:
+com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.QW:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):17:18 -> <init>
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.policies.SameNestHost.getMergeKey(com.android.tools.r8.graph.DexProgramClass):23:23 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
     1:1:java.lang.String getName():28:28 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.wW:
+com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.RW:
     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
     1:1:java.lang.String getName():20:20 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.C00:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy -> com.android.tools.r8.internal.X00:
     com.android.tools.r8.synthesis.SyntheticItems syntheticItems -> c
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode mode -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):24:26 -> <init>
@@ -41513,12 +41634,12 @@
     4:8:com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy.getMergeKey(com.android.tools.r8.graph.DexProgramClass):33:37 -> a
     4:8:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):14 -> a
     1:1:java.lang.String getName():42:42 -> e
-com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.B00:
+com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind -> com.android.tools.r8.internal.W00:
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind SYNTHETIC -> b
     com.android.tools.r8.horizontalclassmerging.policies.SyntheticItemsPolicy$ClassKind NOT_SYNTHETIC -> c
     1:2:void <clinit>():17:18 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.horizontalclassmerging.policies.VerifyMultiClassPolicyAlwaysSatisfied -> com.android.tools.r8.internal.m40:
+com.android.tools.r8.horizontalclassmerging.policies.VerifyMultiClassPolicyAlwaysSatisfied -> com.android.tools.r8.internal.I40:
     com.android.tools.r8.horizontalclassmerging.MultiClassPolicy policy -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
@@ -41534,7 +41655,7 @@
     27:27:java.lang.String getName():23:23 -> e
     24:24:java.lang.String getName():23:23 -> e
     1:1:boolean shouldSkipPolicy():28:28 -> j
-com.android.tools.r8.horizontalclassmerging.policies.VerifySingleClassPolicyAlwaysSatisfied -> com.android.tools.r8.internal.n40:
+com.android.tools.r8.horizontalclassmerging.policies.VerifySingleClassPolicyAlwaysSatisfied -> com.android.tools.r8.internal.J40:
     com.android.tools.r8.horizontalclassmerging.SingleClassPolicy policy -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():11:11 -> <clinit>
@@ -41547,14 +41668,14 @@
     31:31:java.lang.String getName():27:27 -> e
     28:28:java.lang.String getName():27:27 -> e
     1:1:boolean shouldSkipPolicy():32:32 -> j
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation -> com.android.tools.r8.internal.nX:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation -> com.android.tools.r8.internal.IX:
     java.util.Map singleClinitCallers -> b
     com.android.tools.r8.utils.collections.ProgramMethodMap singleCallers -> a
     1:3:void <init>(com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.Map):42:44 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder builder(com.android.tools.r8.graph.AppView):48:48 -> a
     2:2:com.android.tools.r8.graph.ProgramMethod getSingleCaller(com.android.tools.r8.graph.ProgramMethod):52:52 -> a
     3:3:com.android.tools.r8.graph.ProgramMethod getSingleClassInitializerCaller(com.android.tools.r8.graph.DexProgramClass):56:56 -> a
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder -> com.android.tools.r8.internal.mX:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder -> com.android.tools.r8.internal.HX:
     java.util.Map clinitCallers -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.collections.ProgramMethodMap callers -> b
@@ -41567,7 +41688,7 @@
     13:13:void lambda$build$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):86:86 -> a
     14:14:void lambda$build$3(java.util.Map,com.android.tools.r8.graph.DexProgramClass,java.util.Optional):86:86 -> a
     15:15:void processMethod(com.android.tools.r8.graph.ProgramMethod):91:91 -> a
-com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor -> com.android.tools.r8.internal.lX:
+com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor -> com.android.tools.r8.internal.GX:
     com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder this$0 -> f
     com.android.tools.r8.graph.AppView appView -> e
     boolean $assertionsDisabled -> g
@@ -41686,7 +41807,7 @@
     7:7:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexProgramClass):130:130 -> g
     7:7:void com.android.tools.r8.horizontalclassmerging.policies.deadlock.SingleCallerInformation$Builder$InvokeExtractor.triggerClassInitializerIfNotAlreadyTriggeredInContext(com.android.tools.r8.graph.DexType):124 -> g
     7:7:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):254 -> g
-com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.Da:
+com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.Ga:
     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):20:20 -> <init>
@@ -41697,7 +41818,7 @@
     1:1:void forEachMethod(java.util.function.Consumer):45:45 -> forEachMethod
     1:4:com.android.tools.r8.references.ClassReference getClassReference():26:29 -> getClassReference
     1:2:java.lang.String getSourceFile():34:35 -> getSourceFile
-com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.wk:
+com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.Bk:
     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
@@ -41708,14 +41829,14 @@
     1:4: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.Jq:
+com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.Oq:
     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.rG:
+com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.yG:
     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
@@ -41725,7 +41846,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.e40:
+com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.A40:
     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>
@@ -41840,7 +41961,7 @@
     3:3:boolean com.android.tools.r8.graph.DexType.isShortType():289:289 -> isShortValue
     3:3:boolean isShortValue():99 -> isShortValue
     1:1:boolean isStringValue():179:179 -> isStringValue
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.ma:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.pa:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis TRIVIAL -> e
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> c
@@ -41866,15 +41987,15 @@
     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.ia:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.internal.la:
     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.ja:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.ma:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption INSTRUCTION_DOES_NOT_THROW -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption NONE -> c
     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.ka:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.na:
     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
@@ -41916,12 +42037,12 @@
     208:208: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
     209:210:void enqueue(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Deque):546:547 -> a
     211:232:void enqueueInitializedClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.List,java.util.Set,java.util.Deque):556:577 -> a
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.la:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.oa:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY_OR_INDIRECTLY -> c
     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.wg:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.Ag:
     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
@@ -41954,9 +42075,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.lq:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.qq:
     1:15:java.util.Set computeInitializedClassesOnNormalExit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):40:54 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.kq:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.pq:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set initializedClassesOnNormalExit -> c
     com.android.tools.r8.graph.ProgramMethod context -> b
@@ -41977,7 +42098,7 @@
     65:65:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance):160:160 -> a
     65:65:java.lang.Object visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance):57 -> a
     1:1:java.util.Set build():69:69 -> b
-com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.N20:
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.j30:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.VerifyTypesHelper verifyTypesHelper -> b
     boolean $assertionsDisabled -> c
@@ -42000,7 +42121,7 @@
     34:36:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.Throw):117:119 -> a
     34:36:boolean check(com.android.tools.r8.ir.code.IRCode):57 -> a
     37:49:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):96:108 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.g40:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.C40:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -42050,7 +42171,7 @@
     145:145:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):52:52 -> a
     145:145: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):320 -> a
     146:160: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):321:335 -> a
-    161:165:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):1220:1224 -> a
+    161:165:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):1246:1250 -> a
     161:165: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):335 -> a
     166:180: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):336:350 -> a
     181:181:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
@@ -42094,7 +42215,7 @@
     8:8:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):278 -> b
     9:9:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165:165 -> b
     9:9:boolean isNonPinnedClassConstant(com.android.tools.r8.ir.code.Value):278 -> b
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.f40:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.B40:
     java.util.Set trackedValues -> b
     com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState EMPTY -> c
     boolean hasTrackedValueEscaped -> a
@@ -42102,21 +42223,21 @@
     1:6:void <init>():428:433 -> <init>
     1:1:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState empty():436:436 -> a
     2:2:boolean isTrackingValue(com.android.tools.r8.ir.code.Value):449:449 -> a
-com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.o40:
+com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.K40:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     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.O5:
+com.android.tools.r8.ir.analysis.constant.Bottom -> com.android.tools.r8.internal.Q5:
     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
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.Kd:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.Nd:
     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
@@ -42131,7 +42252,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.Pd:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.Sd:
     com.android.tools.r8.ir.code.Value value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -42154,12 +42275,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.DC:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.JC:
     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.YX:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.tY:
     java.util.Deque ssaEdges -> d
     java.util.Map mapping -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -42292,14 +42413,14 @@
     172:177:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
     178:178:void com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation.addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):247:247 -> b
     178:178:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.j10:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.F10:
     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
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.d40:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.z40:
     java.util.Map nodes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():27:27 -> <clinit>
@@ -42311,7 +42432,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.c40:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.y40:
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     com.android.tools.r8.ir.code.Value value -> a
@@ -42326,7 +42447,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.J4:
+com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption -> com.android.tools.r8.internal.L4:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     boolean $assertionsDisabled -> c
@@ -42385,7 +42506,7 @@
     1:7:boolean com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption.definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):180 -> b
     1:7:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):176 -> b
     8:8:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):176:176 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.Nj:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.Sj:
     java.util.Deque valuesToTrack -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set trackedValues -> c
@@ -42414,9 +42535,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.Oj:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.Tj:
     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.gk:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.lk:
     com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis fieldReadForInvokeReceiverAnalysis -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker -> b
@@ -42429,7 +42550,7 @@
     4:23:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):73:92 -> a
     24:29:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):91:96 -> a
     30:43:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):95:108 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.pk:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.uk:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph fieldAccessGraph -> d
@@ -42455,11 +42576,11 @@
     10:10:boolean com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.isClass():0:0 -> a
     10:10:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):229 -> a
     11:15:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):229:233 -> a
-    16:16:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    16:16:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> a
     16:16:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):233 -> a
     17:17:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):232:232 -> a
     18:29:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):197:208 -> a
-    30:30:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    30:30:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> a
     30:30:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):208 -> a
     31:32:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):208:209 -> a
     33:37:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$recordFieldPut$4(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):206:210 -> a
@@ -42497,7 +42618,7 @@
     100:100:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState lambda$acceptClassInitializerDefaultsResult$2(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState):176 -> a
     101:102:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):182:183 -> a
     103:103:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):192:192 -> a
-    104:104:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createZeroValue():49:49 -> a
+    104:104:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createZeroValue():54:54 -> a
     104:104:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):192 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     105:105:void recordFieldPut(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):192:192 -> a
@@ -42549,7 +42670,7 @@
     239:247:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):354:362 -> a
     239:247:void lambda$waveDone$6(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.ProgramField):435 -> a
     248:248:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):368:368 -> a
-    249:249:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexClassAndField):1010:1010 -> a
+    249:249:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexClassAndField):972:972 -> a
     249:249:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):368 -> a
     250:258:void recordAllInstanceFieldPutsProcessed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):369:377 -> a
     259:259:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection.get(com.android.tools.r8.graph.DexClassAndField):42:42 -> a
@@ -42566,16 +42687,16 @@
     291:299:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):432:440 -> a
     300:300:void lambda$waveDone$7(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass):437:437 -> a
     1:27:void initializeAbstractInstanceFieldValues():104:130 -> b
-    28:28:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> b
+    28:28:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> b
     28:28:void initializeAbstractInstanceFieldValues():130 -> b
-    29:29:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> b
+    29:29:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> b
     29:29:void initializeAbstractInstanceFieldValues():130 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:39:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):409:418 -> b
     40:40:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> b
     40:40:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):418 -> b
     41:47:void recordAllAllocationsSitesProcessed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):419:425 -> b
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.nk:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.sk:
     java.util.Map fieldWrites -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingFieldWrites -> b
     1:1:void <init>():452:452 -> <init>
@@ -42585,7 +42706,7 @@
     14:14:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):468:468 -> a
     15:16:void lambda$initialize$1(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):468:469 -> a
     17:24:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):476:483 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.ok:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.tk:
     java.util.Map objectAllocations -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingObjectAllocations -> b
     1:1:void <init>():500:500 -> <init>
@@ -42594,7 +42715,7 @@
     3:6:void lambda$initialize$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set):507:510 -> a
     7:7:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):508:508 -> a
     8:15:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):516:523 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.qk:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.vk:
     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
@@ -42606,7 +42727,7 @@
     20:30:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29 -> a
     31:31:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29:29 -> a
     32:48:boolean isOnlyUsedToUpdateFieldValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexEncodedField):66:82 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis -> com.android.tools.r8.internal.Hk:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForInvokeReceiverAnalysis -> com.android.tools.r8.internal.Mk:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -42638,7 +42759,7 @@
     30:30:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):40 -> a
     31:35:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.graph.ProgramMethod):41:45 -> a
     36:36:void lambda$recordFieldAccess$0(java.util.Set,com.android.tools.r8.graph.bytecodemetadata.BytecodeInstructionMetadata$Builder):46:46 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis -> com.android.tools.r8.internal.Ik:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis -> com.android.tools.r8.internal.Nk:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):24:25 -> <init>
     1:7:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder):32:38 -> a
@@ -42654,7 +42775,7 @@
     29:29:boolean isValueOnlyUsedToWriteField(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramField):51:51 -> a
     30:33:boolean com.android.tools.r8.ir.analysis.fieldaccess.FieldReadForWriteAnalysis.enqueueUsersForAnalysis(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):75:78 -> a
     30:33:boolean isValueOnlyUsedToWriteField(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramField):51 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.O10:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.k20:
     java.util.Set nonConstantFields -> g
     java.util.Map dependencies -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -42700,10 +42821,10 @@
     71:71:void com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor.clearReadsAndWritesFromFieldsOfInterest(com.android.tools.r8.shaking.AppInfoWithLiveness):173:173 -> a
     71:71:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):102 -> a
     72:80:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):103:111 -> a
-    81:81:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    81:81:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     81:81:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):111 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    82:82:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    82:82:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     82:82:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):111 -> a
     83:83:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.utils.Timing):111:111 -> a
     84:87:void markFieldAsDead(com.android.tools.r8.graph.DexEncodedField):124:127 -> a
@@ -42745,8 +42866,8 @@
     174:174:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):289 -> a
     175:175:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):74:74 -> a
     175:175:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):170 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     175:175:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):289 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     176:176:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):74:74 -> a
     176:176:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexEncodedField.getTypeElement(com.android.tools.r8.graph.AppView):170 -> a
     176:176:boolean canOptimizeOnlyReadOrWrittenField(com.android.tools.r8.graph.DexEncodedField,boolean,com.android.tools.r8.graph.FieldAccessInfoCollection):289 -> a
@@ -42769,7 +42890,7 @@
     1:1:java.util.Set access$400(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):49:49 -> e
     1:1:java.util.Set access$500(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):49:49 -> f
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$600(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):49:49 -> g
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.N10:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.j20:
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():312:312 -> <clinit>
@@ -42826,13 +42947,13 @@
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):471:471 -> g
-com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState -> com.android.tools.r8.internal.S5:
+com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState -> com.android.tools.r8.internal.U5:
     com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):23:23 -> a
     1:1:com.android.tools.r8.ir.analysis.fieldaccess.state.BottomFieldState getInstance():18:18 -> e
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState -> com.android.tools.r8.internal.gd:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState -> com.android.tools.r8.internal.jd:
     1:1:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):20:20 -> <init>
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState asArray() -> a
     1:1:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState create(com.android.tools.r8.ir.analysis.value.AbstractValue):24:24 -> a
@@ -42848,7 +42969,7 @@
     8:8:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):42 -> a
     9:9:com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.unknown():18:18 -> a
     9:9:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):42 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState -> com.android.tools.r8.internal.kd:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState -> com.android.tools.r8.internal.nd:
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():15:15 -> <clinit>
@@ -42869,10 +42990,10 @@
     14:14:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.ProgramField):55 -> a
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState asClass() -> b
     1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():31:31 -> e
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteFieldState -> com.android.tools.r8.internal.md:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteFieldState -> com.android.tools.r8.internal.pd:
     1:1:void <init>():8:8 -> <init>
     boolean isConcrete() -> d
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState -> com.android.tools.r8.internal.wd:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState -> com.android.tools.r8.internal.zd:
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> a
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):15:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState create(com.android.tools.r8.ir.analysis.value.AbstractValue):20:20 -> a
@@ -42893,18 +43014,18 @@
     11:11:com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState.unknown():18:18 -> a
     11:11:com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState mutableJoin(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory):46 -> a
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState asPrimitive() -> c
-com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteReferenceTypeFieldState -> com.android.tools.r8.internal.zd:
+com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteReferenceTypeFieldState -> com.android.tools.r8.internal.Cd:
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> a
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):15:16 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):21:21 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState -> com.android.tools.r8.internal.Pk:
+com.android.tools.r8.ir.analysis.fieldaccess.state.FieldState -> com.android.tools.r8.internal.Uk:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteArrayTypeFieldState asArray() -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValueFactory) -> a
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcreteClassTypeFieldState asClass() -> b
     com.android.tools.r8.ir.analysis.fieldaccess.state.ConcretePrimitiveTypeFieldState asPrimitive() -> c
     boolean isConcrete() -> d
-com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState -> com.android.tools.r8.internal.t30:
+com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState -> com.android.tools.r8.internal.P30:
     com.android.tools.r8.ir.analysis.fieldaccess.state.UnknownFieldState INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -42921,7 +43042,7 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isEmpty() -> c
     boolean isKnownFieldSet() -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.rd:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.ud:
     java.util.Set fields -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():21:21 -> <clinit>
@@ -42959,7 +43080,7 @@
     1:5:boolean equals(java.lang.Object):131:135 -> equals
     1:1:int hashCode():123:123 -> hashCode
     1:1:int size():118:118 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.xi:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.Bi:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:3:void <clinit>():15:17 -> <clinit>
@@ -42972,7 +43093,7 @@
     boolean isEmpty() -> c
     boolean isKnownFieldSet() -> d
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():22:22 -> e
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Sk:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Xk:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> e
@@ -43062,13 +43183,13 @@
     55:55:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():283 -> c
     56:80:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():284:308 -> 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.Rk:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.Wk:
     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.Sq:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.Xq:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexClassAndMethod parentConstructor -> k
     com.android.tools.r8.ir.code.InvokeDirect parentConstructorCall -> l
@@ -43101,11 +43222,11 @@
     75:75: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):121:121 -> a
     75:75:void analyzeForwardingConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Value):145 -> a
     76:81:void analyzeForwardingConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Value):153:158 -> a
-    82:86:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):1220:1224 -> a
+    82:86:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):1246:1250 -> a
     82:86:void analyzeForwardingConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Value):158 -> a
     87:93:void analyzeForwardingConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Value):158:164 -> a
     94:105:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):197:208 -> a
-    106:106:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.code.Value.getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1154:1154 -> a
+    106:106:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.code.Value.getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1155:1155 -> a
     106:106:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):208 -> a
     107:113:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):209:215 -> a
     114:114:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
@@ -43130,10 +43251,10 @@
     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):59:59 -> 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.zA:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.FA:
     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.MY:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.hZ:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder builder -> i
     boolean $assertionsDisabled -> k
     java.util.Map computedValues -> j
@@ -43164,14 +43285,14 @@
     56:56:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView):60 -> 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):151 -> 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):152:152 -> a
-    58:58:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    58:58:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> a
     58:58:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):152 -> a
     59: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):153:158 -> a
     65:71:void updateFieldOptimizationInfoWith2Values(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexValue):167:173 -> a
     72:74:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):177:179 -> a
     75:75: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):186:186 -> a
     75:75:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):180 -> a
-    76:76:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():204:204 -> a
+    76:76:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():205:205 -> a
     76:76: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):186 -> a
     76:76:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):180 -> a
     77:77: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):186:186 -> a
@@ -43179,7 +43300,7 @@
     78:78:com.android.tools.r8.ir.analysis.value.SingleFieldValue com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):206:206 -> a
     78:78: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):187 -> a
     78:78:com.android.tools.r8.ir.analysis.value.AbstractValue getOrComputeAbstractValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexEncodedField):180 -> a
-    79:79:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():204:204 -> a
+    79:79:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():205:205 -> a
     79:79:com.android.tools.r8.ir.analysis.value.SingleFieldValue com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeSingleEnumFieldValue(com.android.tools.r8.ir.code.Value):209 -> 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):187 -> 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):180 -> a
@@ -43223,7 +43344,7 @@
     15:17:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):237:239 -> b
     18:18:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):238:238 -> b
     1:20:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):244:263 -> c
-    21:21:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> c
+    21:21:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> c
     21:21:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):265 -> c
     22:58:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):265:301 -> c
     59:59:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):294:294 -> c
@@ -43261,7 +43382,7 @@
     94:94:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.valuesArrayIndexMatchesOrdinal(int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):364:364 -> c
     94:94:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):284 -> c
     95:136:com.android.tools.r8.ir.analysis.value.SingleFieldValue internalComputeSingleEnumFieldValueForValuesArray(com.android.tools.r8.ir.code.Value):287:328 -> c
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.SY:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues -> com.android.tools.r8.internal.nZ:
     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
@@ -43269,25 +43390,25 @@
     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():114:114 -> 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.NY:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$Builder -> com.android.tools.r8.internal.iZ:
     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.PY:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues -> com.android.tools.r8.internal.kZ:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues INSTANCE -> a
     1:1:void <clinit>():105:105 -> <clinit>
     1:1:void <init>():107:107 -> <init>
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues getInstance():110:110 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.OY:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EmptyStaticValues$Builder -> com.android.tools.r8.internal.jZ:
     1:1:void <init>():117:117 -> <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():127:127 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.RY:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues -> com.android.tools.r8.internal.mZ:
     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.ObjectState getObjectStateForPossiblyPinnedField(com.android.tools.r8.graph.DexField):100:100 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.QY:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues$EnumStaticFieldValues$Builder -> com.android.tools.r8.internal.lZ:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder enumObjectStateBuilder -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue valuesCandidateAbstractValue -> b
     boolean $assertionsDisabled -> c
@@ -43302,7 +43423,7 @@
     12:19:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):66:73 -> a
     20:20:void recordStaticField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexItemFactory):72:72 -> a
     21:26:com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues build():80:85 -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.s30:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.O30:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -43321,7 +43442,7 @@
 com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction -> com.android.tools.r8.internal.v1:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState computeBlockEntryState(java.lang.Object,java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.ControlFlowGraph -> com.android.tools.r8.internal.ve:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.ControlFlowGraph -> com.android.tools.r8.internal.ye:
     1:1:com.android.tools.r8.utils.TraversalContinuation lambda$traverseNormalSuccessors$7(java.util.function.Function,java.lang.Object,java.lang.Object):59:59 -> a
     2:2:com.android.tools.r8.utils.TraversalContinuation traverseExceptionalSuccessors(java.lang.Object,java.util.function.Function):64:64 -> a
     3:3:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.ir.code.IRCode.traverseExceptionalSuccessors(java.lang.Object,java.util.function.BiFunction,java.lang.Object):67:67 -> a
@@ -43352,22 +43473,22 @@
     5:5:void forEachNormalSuccessor(java.lang.Object,java.util.function.Consumer):140:140 -> b
     1:2:com.android.tools.r8.utils.TraversalContinuation lambda$forEachNormalSuccessor$13(java.util.function.Consumer,java.lang.Object):143:144 -> c
     1:1:void forEachExceptionalSuccessor(java.lang.Object,java.util.function.Consumer):149:149 -> d
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.Se:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.We:
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult asSuccessfulAnalysisResult() -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.Qe:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.Ue:
     1:1:void <init>():66:66 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.Re:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.Ve:
     java.util.Map blockExitStates -> a
     1:2:void <init>(java.util.Map):42:43 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult asSuccessfulAnalysisResult() -> a
     1:2:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join():48:49 -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.dk:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.ik:
     1:1:void <init>():16:16 -> <init>
     boolean isFailedTransferResult() -> a
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState():20:20 -> c
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IRControlFlowGraph -> com.android.tools.r8.internal.no:
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisBase -> com.android.tools.r8.internal.Ov:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IRControlFlowGraph -> com.android.tools.r8.internal.so:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraProceduralDataflowAnalysisBase -> com.android.tools.r8.internal.Uv:
     java.util.Map blockExitStates -> d
     com.android.tools.r8.ir.analysis.framework.intraprocedural.ControlFlowGraph cfg -> b
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction transfer -> c
@@ -43438,12 +43559,12 @@
     92:95:void lambda$updateBlockEntryStateCacheForSuccessors$3(java.lang.Object,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState,java.lang.Object):145:148 -> a
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState lambda$run$0(java.lang.Object):70:70 -> b
     boolean shouldCacheBlockEntryStateFor(java.lang.Object) -> c
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.Pv:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.Vv:
     1:1:void <init>(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractTransferFunction):18:18 -> <init>
     1:1:boolean shouldCacheBlockEntryStateFor(java.lang.Object):11:11 -> c
     2:2:boolean com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.shouldCacheBlockEntryStateFor(com.android.tools.r8.ir.code.BasicBlock):23:23 -> c
     2:2:boolean shouldCacheBlockEntryStateFor(java.lang.Object):11 -> c
-com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.y10:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.U10:
     boolean isFailedTransferResult() -> a
     boolean isAbstractState() -> b
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> c
@@ -43453,7 +43574,7 @@
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
     boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod) -> a
-com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint -> com.android.tools.r8.internal.Fj:
+com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint -> com.android.tools.r8.internal.Kj:
     boolean value -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -43478,7 +43599,7 @@
     28:28:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:29:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):60:60 -> a
-com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.Gj:
+com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.Lj:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(int,long):10:10 -> <init>
@@ -43487,13 +43608,13 @@
     4:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27:27 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.EqualToNumberSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createEqualToNumberConstraint(int,long):94:94 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27 -> a
-com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.yI:
+com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint -> com.android.tools.r8.internal.FI:
     com.android.tools.r8.ir.analysis.inlining.NeverSimpleInliningConstraint INSTANCE -> b
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
     boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod) -> a
-com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.EJ:
+com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint -> com.android.tools.r8.internal.LJ:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>(int,long):10:10 -> <init>
@@ -43502,7 +43623,7 @@
     4:4:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27:27 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.NotEqualToNumberSimpleInliningConstraint com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory.createNotEqualToNumberConstraint(int,long):89:89 -> a
     5:5:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):27 -> a
-com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.LJ:
+com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint -> com.android.tools.r8.internal.SJ:
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():20:20 -> <clinit>
@@ -43527,7 +43648,7 @@
     29:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint.withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):87:87 -> a
     29:29:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):63 -> a
     30:43:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):68:81 -> a
-com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.ZJ:
+com.android.tools.r8.ir.analysis.inlining.NumberSimpleInliningConstraint -> com.android.tools.r8.internal.gK:
     long rawValue -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -43546,14 +43667,14 @@
     15:21:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory):43:49 -> a
     22:24:boolean isSatisfied(com.android.tools.r8.ir.code.InvokeMethod):54:56 -> a
     1:1:long getRawValue():26:26 -> i
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.eX:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint -> com.android.tools.r8.internal.zX:
     int argumentIndex -> b
     1:2:void <init>(int):14:15 -> <init>
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint withArgumentIndex(int,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory) -> a
     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.fX:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint -> com.android.tools.r8.internal.AX:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -43602,7 +43723,7 @@
     boolean isConjunction() -> e
     boolean isDisjunction() -> f
     boolean isNever() -> g
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.hX:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis -> com.android.tools.r8.internal.CX:
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory factory -> a
     java.util.Set seen -> d
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -43697,10 +43818,10 @@
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$1(com.android.tools.r8.ir.code.If,int):144:144 -> 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):76:76 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$analyzeInstructionsInBlock$1(com.android.tools.r8.ir.code.If,int):144 -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.gX:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintAnalysis$1 -> com.android.tools.r8.internal.BX:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():172:172 -> <clinit>
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.iX:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintConjunction -> com.android.tools.r8.internal.DX:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -43730,7 +43851,7 @@
     57:58:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):81:82 -> a
     59:59:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isAlways():0:0 -> a
     59:59:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):82 -> a
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.jX:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction -> com.android.tools.r8.internal.EX:
     java.util.List constraints -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():16:16 -> <clinit>
@@ -43760,7 +43881,7 @@
     57:57:boolean com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint.isNever():0:0 -> a
     57:57:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint lambda$fixupAfterParametersChanged$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):82 -> a
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintDisjunction asDisjunction() -> b
-com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.kX:
+com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraintFactory -> com.android.tools.r8.internal.FX:
     com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint[] lowEqualToTrueConstraints -> b
     com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint[] lowEqualToFalseConstraints -> a
     com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint[] lowEqualToNullConstraints -> d
@@ -43779,7 +43900,7 @@
     10:10:com.android.tools.r8.ir.analysis.inlining.SimpleInliningArgumentConstraint lambda$createArgumentConstraint$2(java.util.function.Supplier,java.lang.Integer):101:101 -> a
     1:1:com.android.tools.r8.ir.analysis.inlining.EqualToBooleanSimpleInliningConstraint lambda$createEqualToBooleanConstraint$0(int,boolean):67:67 -> b
     2:2:com.android.tools.r8.ir.analysis.inlining.NullSimpleInliningConstraint lambda$createNullConstraint$1(int,com.android.tools.r8.ir.analysis.type.Nullability):84:84 -> b
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.iD:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.oD:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:9:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):19:27 -> a
@@ -43792,7 +43913,7 @@
     17:17:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1693:1693 -> a
     17:17:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):32 -> a
     18:20:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):32:34 -> a
-com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.gj:
+com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.lj:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set deadEnumLiteMaps -> c
@@ -43801,7 +43922,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():1730:1730 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1706:1706 -> a
     2:2:void clearDeadEnumLiteMaps():59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:11:void clearDeadEnumLiteMaps():59:67 -> a
@@ -43855,7 +43976,7 @@
     4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
     4:4:void verifyDeadEnumLiteMapsAreDead():153 -> c
     5:5:void verifyDeadEnumLiteMapsAreDead():153:153 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.vm:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.Am:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map removedExtensionFields -> d
@@ -43905,13 +44026,13 @@
     8:10:void forEachDeadProtoExtensionField(java.util.function.Consumer):272:274 -> b
     1:3:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):212:214 -> c
     1:2:void forEachMethodThatRequiresPostOptimization(java.util.function.Consumer):184:185 -> d
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.um:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.zm:
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> b
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):117:117 -> <init>
     1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):122:122 -> 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):123 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Fm:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Km:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map builders -> d
@@ -43945,7 +44066,7 @@
     294:294:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.function.BooleanSupplier):176 -> a
     295:297:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.function.BooleanSupplier):177:179 -> a
     298:303:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):193:198 -> a
-    304:304:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):305:305 -> a
+    304:304:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):312:312 -> a
     304:304:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):198 -> a
     305:315:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):199:209 -> a
     316:317: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):202:203 -> a
@@ -43953,10 +44074,10 @@
     320:320:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1067:1067 -> a
     320:320: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):218 -> a
     321:337: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):220:236 -> a
-    338:338:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    338:338:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     338:338: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):236 -> a
     339:346: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):242:249 -> a
-    347:347:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    347:347:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     347:347: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):249 -> a
     348:355:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):251:258 -> a
     356:356: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):39:39 -> a
@@ -44006,7 +44127,7 @@
     2:2:boolean lambda$computeEnableAggressiveBuilderOptimization$1(com.android.tools.r8.graph.DexClass):112:112 -> b
     3:4:com.android.tools.r8.graph.analysis.EnqueuerAnalysis createEnqueuerAnalysis():128:129 -> b
     1:1:com.android.tools.r8.ir.analysis.proto.ProtoReferences access$200(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):61:61 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Dm:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Im:
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker this$0 -> b
     java.util.Set val$seen -> a
     boolean $assertionsDisabled -> c
@@ -44019,7 +44140,7 @@
     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):155:158 -> 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):157:162 -> 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):161:161 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.Em:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.Jm:
     java.util.Set bypassClinitforInlining -> g
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.graph.AppView appView -> a
@@ -44053,7 +44174,7 @@
     12:13:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeClass(com.android.tools.r8.graph.DexType):475:476 -> b
     12:13:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeGeneratedMessageLiteBuilder():465 -> b
     12:13:void extend(com.android.tools.r8.graph.SubtypingInfo):427 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Gm:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Lm:
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder encoder -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> d
@@ -44109,7 +44230,7 @@
     45:46:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
     45:46:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
     45:46:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    47:47:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
+    47:47:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():37:37 -> a
     47:47:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):295 -> a
     47:47:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
     47:47:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
@@ -44118,7 +44239,7 @@
     48:57:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
     48:57:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
     48:57:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    58:58:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
+    58:58:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):37:37 -> a
     58:58:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):304 -> a
     58:58:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
     58:58:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
@@ -44127,7 +44248,7 @@
     59:61:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
     59:61:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
     59:61:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    62:62:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
+    62:62:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):37:37 -> a
     62:62:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):311 -> a
     62:62:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
     62:62:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
@@ -44136,7 +44257,7 @@
     63:65:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
     63:65:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
     63:65:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
-    66:66:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
+    66:66:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):37:37 -> a
     66:66:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):312 -> a
     66:66:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):279 -> a
     66:66:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):262 -> a
@@ -44171,10 +44292,10 @@
     74:77:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):265:268 -> a
     74:77:void run(com.android.tools.r8.ir.code.IRCode):112 -> a
     78:78:void run(com.android.tools.r8.ir.code.IRCode):113:113 -> a
-    79:79:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    79:79:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     79:79:void run(com.android.tools.r8.ir.code.IRCode):113 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    80:80:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    80:80:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     80:80:void run(com.android.tools.r8.ir.code.IRCode):113 -> a
     81:81:void run(com.android.tools.r8.ir.code.IRCode):114:114 -> a
     82:88:void optimizeNewMutableInstance(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):119:125 -> a
@@ -44249,7 +44370,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     201:201:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):199:199 -> a
     201:201:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):327 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.tR:
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.NR:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> i
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> j
     1:1:void <clinit>():25:25 -> <clinit>
@@ -44274,7 +44395,7 @@
     9:15:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):81 -> e
     16:19:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):82:85 -> e
     1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():39:39 -> g
-com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.uR:
+com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover -> com.android.tools.r8.internal.OR:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> a
     java.util.Map staticFieldValuesMap -> b
     java.util.Map staticFieldValuesMapDelayed -> c
@@ -44293,7 +44414,7 @@
     12:16: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
     17:25: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):60:68 -> a
     26:31: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):67:72 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.zR:
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.TR:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> a
     boolean $assertionsDisabled -> c
@@ -44324,7 +44445,7 @@
     15:15:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isProtoLibraryClass(com.android.tools.r8.graph.DexProgramClass):203:203 -> a
     15:15: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):61 -> a
     15:15: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
-    16:16:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    16:16:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     16:16:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isProtoLibraryClass(com.android.tools.r8.graph.DexProgramClass):203 -> a
     16:16: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):61 -> a
     16:16: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
@@ -44349,7 +44470,7 @@
     43:43: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
     44:47: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):85:88 -> a
     44:47: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):52 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.TR:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.mS:
     com.android.tools.r8.graph.DexType generatedMessageLiteExtendableMessageType -> l
     com.android.tools.r8.graph.DexType generatedMessageLiteBuilderType -> j
     com.android.tools.r8.graph.DexType methodToInvokeType -> n
@@ -44417,29 +44538,29 @@
     26:26:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.ProgramMethod):189:189 -> a
     1:1:com.android.tools.r8.graph.DexField getEnumVerifierInstanceField(com.android.tools.r8.graph.DexProgramClass):149:149 -> b
     2:3:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):183:184 -> b
-    4:4:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> b
+    4:4:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> b
     4:4:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):184 -> b
     5:5:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):184:184 -> b
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.OR:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.hS:
     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):206:206 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):211:215 -> <init>
     7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):213:225 -> <init>
     20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):223:223 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.PR:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.iS:
     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):307:307 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):311:315 -> <init>
     7:7:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):313:313 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.QR:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.jS:
     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):324:324 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):329:333 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):331:338 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):336:336 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.RR:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.kS:
     com.android.tools.r8.graph.DexMethod newSingularGeneratedExtension -> e
     com.android.tools.r8.graph.DexMethod newRepeatedGeneratedExtension -> d
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethodWithObject -> c
@@ -44452,7 +44573,7 @@
     23:31:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):265:273 -> <init>
     32:47:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):271:286 -> <init>
     48:48:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):284:284 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.SR:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.lS:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -44462,7 +44583,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):349:349 -> <init>
     2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):359:376 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.UR:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.nS:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.ProtoEnumSwitchMapRemover protoEnumSwitchMapRemover -> g
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker generatedMessageLiteBuilderShrinker -> e
@@ -44478,12 +44599,12 @@
     2:28:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):28:54 -> <init>
     1:1:java.util.Set getDeadProtoTypes():78:78 -> a
     2:4:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):88:90 -> a
-    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():1031:1031 -> a
+    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():1007:1007 -> a
     5:5:void setDeadProtoTypes(java.util.Set):83 -> a
     6:6:void setDeadProtoTypes(java.util.Set):84:84 -> a
-    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():1032:1032 -> a
+    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():1008:1008 -> a
     7:7:void setDeadProtoTypes(java.util.Set):83 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.XR:
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.qS:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():11:11 -> <clinit>
@@ -44494,7 +44615,7 @@
     3:3:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):199:199 -> a
     3: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 -> a
     4:6: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
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.gS:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.BS:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> a
     boolean $assertionsDisabled -> c
@@ -44551,33 +44672,27 @@
     179:180:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):201:202 -> a
     181:181:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     181:181: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
-    182:184: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
-    185:185:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):544:544 -> a
-    185:185: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
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    186:191:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):544:549 -> a
-    186:191: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
-    192:196: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
-    197:197:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    197:197:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):213 -> a
-    198:201:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):214:217 -> a
-    202:202:boolean com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo.isFieldNameComputationInfo():0:0 -> a
-    202:202:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):217 -> a
-    203:210:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):218:225 -> a
-    211:211:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
-    211:211:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):227 -> a
-    212:214:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):228:230 -> a
-    215:215:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    215:215:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):232 -> a
-    216:220:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):233:237 -> a
-    221:221:int invalidInfoFailure():241:241 -> a
-    222:222:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):250:250 -> a
-    223:223:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    223:223:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):250 -> a
-    224:224:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):251:251 -> a
-    225:225:com.android.tools.r8.utils.ThrowingIntIterator com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.createInfoIterator(com.android.tools.r8.graph.DexString):259:259 -> a
-    225:225:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):251 -> a
-    226:226:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):253:253 -> a
+    182:190:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):204:212 -> a
+    191:191:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    191:191:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):213 -> a
+    192:195:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):214:217 -> a
+    196:196:boolean com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo.isFieldNameComputationInfo():0:0 -> a
+    196:196:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):217 -> a
+    197:204:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):218:225 -> a
+    205:205:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
+    205:205:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):227 -> a
+    206:208:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):228:230 -> a
+    209:209:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    209:209:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):232 -> a
+    210:214:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):233:237 -> a
+    215:215:int invalidInfoFailure():241:241 -> a
+    216:216:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):250:250 -> a
+    217:217:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    217:217:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):250 -> a
+    218:218:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):251:251 -> a
+    219:219:com.android.tools.r8.utils.ThrowingIntIterator com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder.createInfoIterator(com.android.tools.r8.graph.DexString):259:259 -> a
+    219:219:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):251 -> a
+    220:220:com.android.tools.r8.utils.ThrowingIntIterator createInfoIterator(com.android.tools.r8.ir.code.Value):253:253 -> a
     1:1:com.android.tools.r8.ir.code.Value invalidObjectsFailure():245:245 -> b
     2:2:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):305:305 -> b
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> b
@@ -44585,7 +44700,7 @@
     4:19:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):309:324 -> b
     20:20:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):317:317 -> b
     21:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):306:306 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.dS:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.yS:
     com.android.tools.r8.utils.ThrowingCharIterator charIterator -> a
     1:3:void <init>(com.android.tools.r8.graph.DexString):259:261 -> <init>
     1:1:boolean hasNext():265:265 -> a
@@ -44597,7 +44712,7 @@
     9:9:int nextInt():291:291 -> b
     10:10:int nextInt():280:280 -> b
     11:11:int nextInt():271:271 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.eS:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.zS:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -44612,10 +44727,10 @@
     16:16:java.lang.Object next():324 -> b
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2.next():346:346 -> b
     17:17:java.lang.Object next():324 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.fS:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.AS:
     1:1:void <init>():369:369 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):369:369 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.hS:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.CS:
     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
@@ -44639,7 +44754,7 @@
     57:68: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):85:96 -> a
     57:68: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.af:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.ef:
     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>
@@ -44656,7 +44771,7 @@
     81:81:java.lang.String toString():37:37 -> toString
     82:82:java.lang.String toString():37:37 -> toString
     76:76:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.aE:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.hE:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):22:23 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
@@ -44668,7 +44783,7 @@
     55:55:java.lang.String toString():52:52 -> toString
     56:56:java.lang.String toString():52:52 -> toString
     53:53:java.lang.String toString():52:52 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.sR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.MR:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     java.util.Set dynamicMethodsWithTracedProtoObjects -> h
     com.android.tools.r8.graph.AppView appView -> a
@@ -44720,7 +44835,7 @@
     64:76:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):180:192 -> a
     77:97:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):474:494 -> a
     77:97:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):193 -> a
-    98:98:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3153:3153 -> a
+    98:98:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3165:3165 -> a
     98:98:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):495 -> a
     98:98:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):193 -> a
     99:100:void com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension.tracePendingInstructionsInDynamicMethods(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):496:497 -> a
@@ -44772,7 +44887,7 @@
     213:215:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):360:362 -> a
     216:216:void populateExtensionGraphWithExtensionFieldDefinition(com.android.tools.r8.ir.code.StaticPut):355:355 -> a
     217:230:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):374:387 -> a
-    231:231:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3153:3153 -> a
+    231:231:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3165:3165 -> a
     231:231:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):387 -> a
     232:255:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):388:411 -> a
     256:256:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
@@ -44781,10 +44896,10 @@
     267:267:boolean com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.isOneOf():0:0 -> a
     267:267:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):421 -> a
     268:269:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):422:423 -> a
-    270:270:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3153:3153 -> a
+    270:270:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3165:3165 -> a
     270:270:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):424 -> a
     271:273:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):427:429 -> a
-    274:274:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3153:3153 -> a
+    274:274:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3165:3165 -> a
     274:274:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):430 -> a
     275:305:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):434:464 -> a
     306:310: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):513:517 -> a
@@ -44806,7 +44921,7 @@
     323:340: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):535:552 -> a
     323:340: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):518 -> a
     323:340:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):468 -> a
-    341:341:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3153:3153 -> a
+    341:341:boolean com.android.tools.r8.shaking.Enqueuer.isFieldReferenced(com.android.tools.r8.graph.ProgramField):3165:3165 -> a
     341:341: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):552 -> a
     341:341: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):518 -> a
     341:341:void markMapOrRequiredFieldsAsReachable(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist):468 -> a
@@ -44844,7 +44959,7 @@
     1:25:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):225:249 -> b
     26:26:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$3(com.android.tools.r8.graph.DexType):361:361 -> b
     1:7:java.util.Map collectExtensionFields():257:263 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.vR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.PR:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> b
     java.util.List objects -> d
     boolean $assertionsDisabled -> e
@@ -44911,11 +45026,11 @@
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType getType():65:65 -> d
     1:1:boolean hasAuxData():43:43 -> e
     1:15:java.lang.String toString():202:216 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.wR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.QR:
     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.xR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.RR:
     boolean isMapFieldWithProto2EnumValue -> e
     boolean hasHasBit -> f
     boolean $assertionsDisabled -> g
@@ -44943,7 +45058,7 @@
     1:1:boolean isValid():134:134 -> k
     1:1:boolean needsIsInitializedCheck():139:139 -> l
     1:14:int serialize():159:172 -> m
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.yR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.SR:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -44952,7 +45067,7 @@
     2:16:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.fromFieldIdWithExtraBits(int):56:70 -> a
     2:16:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):17 -> a
     17:18: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.CR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.WR:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
@@ -44973,7 +45088,7 @@
     1:1:int numberOfHasBitsObjects():245:245 -> j
     1:1:int numberOfOneOfObjects():249:249 -> k
     1:9:java.lang.String toString():254:262 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.AR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.UR:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     boolean $assertionsDisabled -> f
@@ -45018,10 +45133,10 @@
     91:98:void removeUnusedSharedData():165:172 -> c
     99:99:void removeUnusedSharedData():171:171 -> c
     100:101:void removeUnusedSharedData():84:85 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.BR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$ProtoMessageInfoBuilderException -> com.android.tools.r8.internal.VR:
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1):180:180 -> <init>
     2:2:void <init>():181:181 -> <init>
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.IR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.cS:
     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
@@ -45030,18 +45145,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.JR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.dS:
     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.KR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.eS:
     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.MR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.fS:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean,boolean,boolean):20:20 -> <init>
@@ -45053,7 +45168,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.NR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.gS:
     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>
@@ -45061,7 +45176,7 @@
     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.VR:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.oS:
     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
@@ -45072,7 +45187,7 @@
     4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     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.va:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis -> com.android.tools.r8.internal.ya:
     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):43:55 -> a
     14:14:boolean com.android.tools.r8.ir.code.Instruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):635:635 -> 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):56 -> a
@@ -45130,7 +45245,7 @@
     61:63: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):405:407 -> a
     61:63: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):218 -> a
     64:65: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):202:203 -> a
-    66:66:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    66:66:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     66:66: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):203 -> a
     67:77: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):203:213 -> a
     78:78: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):210:210 -> a
@@ -45142,7 +45257,7 @@
     1:1:int hashCode():129:129 -> hashCode
     boolean isArrayType() -> r
     1:1:java.lang.String toString():109:109 -> toString
-com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.M5:
+com.android.tools.r8.ir.analysis.type.BooleanTypeElement -> com.android.tools.r8.internal.O5:
     com.android.tools.r8.ir.analysis.type.BooleanTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -45150,7 +45265,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.BooleanTypeElement getInstance():11:11 -> G
     1:1:int hashCode():36:36 -> hashCode
     1:1:java.lang.String toString():26:26 -> toString
-com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.a6:
+com.android.tools.r8.ir.analysis.type.BottomTypeElement -> com.android.tools.r8.internal.c6:
     com.android.tools.r8.ir.analysis.type.BottomTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -45158,7 +45273,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.BottomTypeElement getInstance():15:15 -> E
     1:1:int hashCode():35:35 -> hashCode
     1:1:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.u6:
+com.android.tools.r8.ir.analysis.type.ByteTypeElement -> com.android.tools.r8.internal.w6:
     com.android.tools.r8.ir.analysis.type.ByteTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -45166,7 +45281,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getInstance():11:11 -> G
     1:1:int hashCode():36:36 -> hashCode
     1:1:java.lang.String toString():26:26 -> toString
-com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.C9:
+com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.F9:
     com.android.tools.r8.ir.analysis.type.CharTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -45174,7 +45289,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.CharTypeElement getInstance():11:11 -> G
     1:1:int hashCode():36:36 -> hashCode
     1:1:java.lang.String toString():26:26 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.rb:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.ub:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> g
@@ -45260,7 +45375,7 @@
     boolean isClassType() -> s
     1:16:java.lang.String toString():168:183 -> toString
     17:26:java.lang.String toString():176:185 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.pb:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.sb:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker LEFT_KNOWN -> c
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker RIGHT_UNKNOWN -> f
     com.android.tools.r8.utils.OptionalBool left -> a
@@ -45285,11 +45400,11 @@
     18:19:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):413 -> a
     20:22:boolean merge(com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):413:415 -> a
     1:2:boolean knownIfBothAreKnown():399:400 -> b
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.qb:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.tb:
     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):424:426 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.Uf:
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.Yf:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     java.util.function.Function mapping -> b
@@ -45333,7 +45448,7 @@
     59:59:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
     59:59:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):77 -> a
     60:60:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):77:77 -> a
-com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.ci:
+com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.gi:
     com.android.tools.r8.ir.analysis.type.DoubleTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -45341,7 +45456,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getInstance():11:11 -> G
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():26:26 -> toString
-com.android.tools.r8.ir.analysis.type.DynamicType -> com.android.tools.r8.internal.li:
+com.android.tools.r8.ir.analysis.type.DynamicType -> com.android.tools.r8.internal.pi:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -45398,7 +45513,7 @@
     boolean isNullType() -> l
     boolean isUnknown() -> m
     1:1:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound unknown():91:91 -> n
-com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound -> com.android.tools.r8.internal.ni:
+com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound -> com.android.tools.r8.internal.ri:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> h
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():11:11 -> <clinit>
@@ -45449,7 +45564,7 @@
     4:4:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.DynamicTypeWithLowerBound.getDynamicLowerBoundType():49:49 -> toString
     4:4:java.lang.String toString():72 -> toString
     5:5:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound -> com.android.tools.r8.internal.oi:
+com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound -> com.android.tools.r8.internal.si:
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> c
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound NULL_TYPE -> e
     com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound BOTTOM -> d
@@ -45517,7 +45632,7 @@
     274:274:java.lang.String toString():271:271 -> toString
     275:275:java.lang.String toString():271:271 -> toString
     272:272:java.lang.String toString():271:271 -> toString
-com.android.tools.r8.ir.analysis.type.ExactDynamicType -> com.android.tools.r8.internal.Pj:
+com.android.tools.r8.ir.analysis.type.ExactDynamicType -> com.android.tools.r8.internal.Uj:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement):16:16 -> <init>
@@ -45556,7 +45671,7 @@
     2:2:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ExactDynamicType.getExactClassType():31:31 -> toString
     2:2:java.lang.String toString():79 -> toString
     3:3:java.lang.String toString():79:79 -> toString
-com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.vl:
+com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.Al:
     com.android.tools.r8.ir.analysis.type.FloatTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -45564,7 +45679,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getInstance():10:10 -> G
     1:1:int hashCode():30:30 -> hashCode
     1:1:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.av:
+com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.gv:
     com.android.tools.r8.ir.analysis.type.IntTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -45572,7 +45687,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInstance():10:10 -> G
     1:1:int hashCode():30:30 -> hashCode
     1:1:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.bv:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection -> com.android.tools.r8.internal.hv:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap interfaces -> a
     com.android.tools.r8.ir.analysis.type.InterfaceCollection EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -45601,7 +45716,7 @@
     1:1:boolean isEmpty():102:102 -> f
     1:1:int size():106:106 -> g
     1:1:int hashCode():123:123 -> hashCode
-com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.bv$a:
+com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder -> com.android.tools.r8.internal.hv$a:
     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):34:34 -> <init>
     2:2:void <init>():37:37 -> <init>
@@ -45610,7 +45725,7 @@
     2:2:java.lang.Boolean lambda$addInterface$0(boolean,com.android.tools.r8.graph.DexType,java.lang.Boolean):55:55 -> a
     3:3:com.android.tools.r8.ir.analysis.type.InterfaceCollection$Builder addKnownInterface(com.android.tools.r8.graph.DexType):60:60 -> a
     4:7:com.android.tools.r8.ir.analysis.type.InterfaceCollection build():64:67 -> a
-com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.PE:
+com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.WE:
     com.android.tools.r8.ir.analysis.type.LongTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -45618,7 +45733,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.LongTypeElement getInstance():11:11 -> G
     1:1:int hashCode():31:31 -> hashCode
     1:1:java.lang.String toString():26:26 -> toString
-com.android.tools.r8.ir.analysis.type.NotNullDynamicType -> com.android.tools.r8.internal.GJ:
+com.android.tools.r8.ir.analysis.type.NotNullDynamicType -> com.android.tools.r8.internal.NJ:
     com.android.tools.r8.ir.analysis.type.NotNullDynamicType INSTANCE -> c
     boolean $assertionsDisabled -> d
     1:3:void <clinit>():21:23 -> <clinit>
@@ -45632,7 +45747,7 @@
     boolean isNotNullType() -> k
     1:1:com.android.tools.r8.ir.analysis.type.NotNullDynamicType get():28:28 -> o
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.MJ:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.TJ:
     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
@@ -45651,7 +45766,7 @@
     1:1:boolean isNullable():49:49 -> h
     1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():99:99 -> i
     1:13:java.lang.String toString():108:120 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.NJ:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.UJ:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement maybeNullVariant -> a
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement bottomVariant -> d
@@ -45671,7 +45786,7 @@
     35:43:void com.android.tools.r8.ir.analysis.type.NullabilityVariants.set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):26:34 -> a
     35:43:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):64 -> a
     44:45:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):65:66 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.SO:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.kP:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -45725,10 +45840,10 @@
     81:81:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.graph.DexItemFactory):62:62 -> b
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
     boolean isPrimitiveType() -> y
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.RO:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement$1 -> com.android.tools.r8.internal.jP:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():115:115 -> <clinit>
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.iU:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.DU:
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement NULL_BOTTOM_INSTANCE -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement NULL_INSTANCE -> d
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
@@ -45753,7 +45868,7 @@
     1:1:boolean equals(java.lang.Object):121:121 -> equals
     1:1:int hashCode():126:126 -> hashCode
     boolean isReferenceType() -> z
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.hU:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.CU:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):15:15 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement.getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):20:20 -> a
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):12 -> a
@@ -45763,7 +45878,7 @@
     1:1:boolean equals(java.lang.Object):56:56 -> equals
     1:1:int hashCode():48:48 -> hashCode
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.SW:
+com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.nX:
     com.android.tools.r8.ir.analysis.type.ShortTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -45771,7 +45886,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.ShortTypeElement getInstance():11:11 -> G
     1:1:int hashCode():36:36 -> hashCode
     1:1:java.lang.String toString():26:26 -> toString
-com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.xX:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.SX:
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -45780,7 +45895,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getInstance():18:18 -> F
     1:1:int hashCode():43:43 -> hashCode
     1:1:java.lang.String toString():33:33 -> toString
-com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.n10:
+com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.J10:
     com.android.tools.r8.ir.analysis.type.TopTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
@@ -45788,7 +45903,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getInstance():15:15 -> E
     1:1:int hashCode():35:35 -> hashCode
     1:1:java.lang.String toString():25:25 -> toString
-com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.J20:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.f30:
     java.util.Deque worklist -> d
     com.android.tools.r8.graph.AppView appView -> c
     boolean $assertionsDisabled -> e
@@ -45813,7 +45928,7 @@
     67:82:com.android.tools.r8.graph.DexType toRefinedReceiverType(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):168:183 -> a
     1:4:void widening(com.android.tools.r8.ir.code.IRCode):54:57 -> b
     5:5:boolean verifyValuesUpToDate(java.lang.Iterable):76:76 -> b
-com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.P20:
+com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.l30:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():20:20 -> <clinit>
@@ -45917,7 +46032,7 @@
     8:8:boolean isPreciseType():359 -> x
     boolean isPrimitiveType() -> y
     boolean isReferenceType() -> z
-com.android.tools.r8.ir.analysis.type.TypeUtils -> com.android.tools.r8.internal.a30:
+com.android.tools.r8.ir.analysis.type.TypeUtils -> com.android.tools.r8.internal.w30:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():36:36 -> <clinit>
     1:12:com.android.tools.r8.ir.analysis.type.TypeElement computeUseType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):72:83 -> a
@@ -45972,13 +46087,13 @@
     73:73:com.android.tools.r8.ir.analysis.type.TypeElement computeUseType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):86 -> a
     74:74:com.android.tools.r8.ir.analysis.type.TypeElement computeUseType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Value):86:86 -> a
     75:79:void enqueueUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.utils.WorkList):96:100 -> a
-com.android.tools.r8.ir.analysis.type.TypeUtils$UserAndValuePair -> com.android.tools.r8.internal.Z20:
+com.android.tools.r8.ir.analysis.type.TypeUtils$UserAndValuePair -> com.android.tools.r8.internal.v30:
     com.android.tools.r8.ir.code.InstructionOrPhi user -> a
     com.android.tools.r8.ir.code.Value value -> b
     1:3:void <init>(com.android.tools.r8.ir.code.InstructionOrPhi,com.android.tools.r8.ir.code.Value):43:45 -> <init>
     1:5:boolean equals(java.lang.Object):53:57 -> equals
     1:1:int hashCode():62:62 -> hashCode
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.m50:
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.I50:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -45997,6 +46112,7 @@
     boolean isSingleFieldValue() -> B
     boolean isSingleStringValue() -> C
     boolean isTrue() -> D
+    1:1:com.android.tools.r8.ir.analysis.value.UnknownValue unknown():20:20 -> E
     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,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):198 -> a
     2:5:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):198:201 -> a
@@ -46074,21 +46190,21 @@
     1:8:void <init>():16:23 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.SingleConstClassValue createSingleConstClassValue(com.android.tools.r8.graph.DexType):27:27 -> a
     2:2:com.android.tools.r8.ir.analysis.value.objectstate.KnownLengthArrayState createKnownLengthArrayState(int):31:31 -> a
-    3:5:com.android.tools.r8.ir.analysis.value.SingleFieldValue createSingleFieldValue(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):35:37 -> a
-    6:6:com.android.tools.r8.ir.analysis.value.SingleNumberValue createSingleNumberValue(long):41:41 -> a
-    7:7:com.android.tools.r8.ir.analysis.value.SingleNumberValue createNullValue():45:45 -> a
-    8:8:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):53:53 -> a
-    9:9:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):58:58 -> a
-com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.c6:
+    3:5:com.android.tools.r8.ir.analysis.value.SingleFieldValue createSingleFieldValue(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):40:42 -> a
+    6:6:com.android.tools.r8.ir.analysis.value.SingleNumberValue createSingleNumberValue(long):46:46 -> a
+    7:7:com.android.tools.r8.ir.analysis.value.SingleNumberValue createNullValue():50:50 -> a
+    8:8:com.android.tools.r8.ir.analysis.value.SingleStringValue createSingleStringValue(com.android.tools.r8.graph.DexString):58:58 -> a
+    9:9:com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue createSingleDexItemBasedStringValue(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):63:63 -> a
+com.android.tools.r8.ir.analysis.value.BottomValue -> com.android.tools.r8.internal.e6:
     com.android.tools.r8.ir.analysis.value.BottomValue INSTANCE -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.value.BottomValue getInstance():18:18 -> E
+    1:1:com.android.tools.r8.ir.analysis.value.BottomValue getInstance():18:18 -> F
     com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> b
     1:1:int hashCode():44:44 -> hashCode
     1:1:java.lang.String toString():49:49 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.Xd:
+com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue -> com.android.tools.r8.internal.ae:
     boolean containsInt(int) -> a
     com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]) -> a
     boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue) -> a
@@ -46097,17 +46213,17 @@
     com.android.tools.r8.ir.analysis.value.SingleNumberValue asSingleNumberValue() -> d
     com.android.tools.r8.ir.analysis.value.NumberFromSetValue asNumberFromSetValue() -> h
     boolean isNonConstantNumberValue() -> j
-com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.nJ:
+com.android.tools.r8.ir.analysis.value.NonConstantNumberValue -> com.android.tools.r8.internal.uJ:
     1:1:void <init>():7:7 -> <init>
-    long getAbstractionSize() -> E
+    long getAbstractionSize() -> F
     com.android.tools.r8.ir.analysis.value.NonConstantNumberValue asNonConstantNumberValue() -> b
     boolean isNonConstantNumberValue() -> j
     com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue asConstantOrNonConstantNumberValue() -> k
     boolean isConstantOrNonConstantNumberValue() -> w
-com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.KJ:
+com.android.tools.r8.ir.analysis.value.NullOrAbstractValue -> com.android.tools.r8.internal.RJ:
     com.android.tools.r8.ir.analysis.value.AbstractValue value -> c
     1:2:void <init>(com.android.tools.r8.ir.analysis.value.AbstractValue):15:16 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getNonNullValue():42:42 -> E
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getNonNullValue():42:42 -> F
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue create(com.android.tools.r8.ir.analysis.value.AbstractValue):20:20 -> a
     2:2:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isBottom():0:0 -> a
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue create(com.android.tools.r8.ir.analysis.value.AbstractValue):20 -> a
@@ -46129,42 +46245,50 @@
     70:70:java.lang.String toString():66:66 -> toString
     67:67:java.lang.String toString():66:66 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.VJ:
-    long maxInclusive -> c
-    boolean $assertionsDisabled -> d
+com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue -> com.android.tools.r8.internal.cK:
+    boolean $assertionsDisabled -> e
+    long maxInclusive -> d
+    long minInclusive -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:4:void <init>(long,long):18:21 -> <init>
-    1:1:long getAbstractionSize():31:31 -> E
+    1:1:long getAbstractionSize():31:31 -> F
+    1:1:long getMaxInclusive():39:39 -> G
+    1:1:long getMinInclusive():35:35 -> H
     1:1:boolean containsInt(int):26:26 -> a
-    2:2:com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]):52:52 -> a
-    3:3:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):57:57 -> a
+    2:2:com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]):60:60 -> a
+    3:3:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):65:65 -> a
     4:4:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    4:4:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):57 -> a
-    5:5:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):58:58 -> a
-    6:6:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNumberFromIntervalValue():0:0 -> a
-    6:6:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):60 -> a
-    7:7:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):61:61 -> a
-    8:8:boolean com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue.mayOverlapWith(com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue):68:68 -> a
-    8:8:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):61 -> a
-    9:9:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):63:63 -> a
-    10:10:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNumberFromSetValue():0:0 -> a
-    10:10:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):63 -> a
-    11:12:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):63:64 -> a
-    13:13:boolean com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue.mayOverlapWith(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):72:72 -> a
-    13:13:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):64 -> a
+    4:4:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):65 -> a
+    5:7:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):66:68 -> a
+    8:8:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNumberFromIntervalValue():0:0 -> a
+    8:8:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):68 -> a
+    9:9:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):69:69 -> a
+    10:10:boolean com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue.mayOverlapWith(com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue):76:76 -> a
+    10:10:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):69 -> a
+    11:11:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):71:71 -> a
+    12:12:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNumberFromSetValue():0:0 -> a
+    12:12:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):71 -> a
+    13:14:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):71:72 -> a
+    15:15:boolean com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue.mayOverlapWith(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):80:80 -> a
+    15:15:boolean mayOverlapWith(com.android.tools.r8.ir.analysis.value.ConstantOrNonConstantNumberValue):72 -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> b
     com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue asNumberFromIntervalValue() -> c
-    1:5:boolean equals(java.lang.Object):83:87 -> equals
-    1:2:int hashCode():93:94 -> hashCode
-    1:1:java.lang.String toString():100:100 -> toString
+    1:5:boolean equals(java.lang.Object):91:95 -> equals
+    1:2:int hashCode():101:102 -> hashCode
+    1:1:java.lang.String toString():0:0 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":110,"2":111,"3":112}}
+    110:110:java.lang.String toString():108:108 -> toString
+    111:111:java.lang.String toString():108:108 -> toString
+    112:112:java.lang.String toString():108:108 -> toString
+    109:109:java.lang.String toString():108:108 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.XJ:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue -> com.android.tools.r8.internal.eK:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet,com.android.tools.r8.ir.analysis.value.NumberFromSetValue$1):17:17 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet):23:24 -> <init>
-    1:1:long getAbstractionSize():46:46 -> E
+    1:1:long getAbstractionSize():46:46 -> F
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet access$000(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):17:17 -> a
     2:2:boolean containsInt(int):41:41 -> a
     3:9:com.android.tools.r8.utils.OptionalBool isSubsetOf(int[]):66:72 -> a
@@ -46181,7 +46305,7 @@
     1:1:int hashCode():106:106 -> hashCode
     1:7:java.lang.String toString():111:117 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.WJ:
+com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder -> com.android.tools.r8.internal.dK:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet numbers -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():120:120 -> <clinit>
@@ -46190,12 +46314,12 @@
     1:4:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInt(int):133:136 -> a
     5:8:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder addInts(com.android.tools.r8.ir.analysis.value.NumberFromSetValue):143:146 -> a
     9:17:com.android.tools.r8.ir.analysis.value.AbstractValue build(com.android.tools.r8.ir.analysis.value.AbstractValueFactory):153:161 -> a
-com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.pX:
-    com.android.tools.r8.graph.DexType type -> c
-    boolean $assertionsDisabled -> d
+com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.KX:
+    com.android.tools.r8.graph.DexType type -> d
+    boolean $assertionsDisabled -> e
     1:1:void <clinit>():30:30 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):35:36 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():50:50 -> E
+    1:1:com.android.tools.r8.graph.DexType getType():50:50 -> F
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):74:79 -> a
     7:13:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):77:83 -> a
@@ -46208,14 +46332,14 @@
     19:19:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):619 -> a
     19:19:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):86 -> a
     20:20:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):86:86 -> a
-    21:25:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):93:97 -> a
+    21:25:boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):93:97 -> a
     26:26: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):23:23 -> a
-    26:26:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):98 -> a
+    26:26:boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):98 -> a
     27:27: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):22:22 -> a
-    27:27:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):98 -> a
-    28:30:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):98:100 -> a
+    27:27:boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):98 -> a
+    28:30:boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):98:100 -> a
     31:40:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):106:115 -> a
-    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    41:41:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     41:41:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
     41:41:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
     41:41:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
@@ -46244,28 +46368,28 @@
     136:136:java.lang.String toString():65:65 -> toString
     137:137:java.lang.String toString():65:65 -> toString
     138:138:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.qX:
+com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.LX:
     1:1:void <init>():7:7 -> <init>
     boolean isSingleConstValue() -> A
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo com.android.tools.r8.ir.analysis.value.SingleConstClassValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):30:30 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.analysis.value.SingleConstClassValue.rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):30:30 -> b
     com.android.tools.r8.ir.analysis.value.SingleConstValue asSingleConstValue() -> n
-com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.sX:
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> d
-    com.android.tools.r8.graph.DexReference item -> c
+com.android.tools.r8.ir.analysis.value.SingleDexItemBasedStringValue -> com.android.tools.r8.internal.NX:
+    com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> e
+    boolean $assertionsDisabled -> f
+    com.android.tools.r8.graph.DexReference item -> d
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):34:36 -> <init>
-    1:1:com.android.tools.r8.graph.DexReference getItem():40:40 -> E
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():44:44 -> F
+    1:1:com.android.tools.r8.graph.DexReference getItem():40:40 -> F
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():44:44 -> G
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
+    boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
     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.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):82:87 -> a
     7:15:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):85:93 -> a
     1:3:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):120:122 -> c
     4:4:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):121:121 -> c
-    5:5: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):58:58 -> c
+    5:5: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):63:63 -> c
     5:5:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):121 -> c
     1:5:boolean equals(java.lang.Object):59:63 -> equals
     1:1:int hashCode():68:68 -> hashCode
@@ -46276,37 +46400,38 @@
     76:76:java.lang.String toString():73:73 -> toString
     77:77:java.lang.String toString():73:73 -> toString
     74:74:java.lang.String toString():73:73 -> toString
-com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.tX:
-    com.android.tools.r8.graph.DexField field -> c
-    boolean $assertionsDisabled -> d
+com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.OX:
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.graph.DexField field -> d
     1:1:void <clinit>():35:35 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexField):39:40 -> <init>
     boolean isSingleFieldValue() -> B
-    1:1:com.android.tools.r8.graph.DexField getField():44:44 -> E
+    1:1:com.android.tools.r8.graph.DexField getField():44:44 -> F
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):35:35 -> a
     2:3:com.android.tools.r8.graph.DexEncodedField getField(com.android.tools.r8.graph.DexDefinitionSupplier):48:49 -> a
     4:7:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):92:95 -> a
-    8:8:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):102:102 -> a
-    9:9:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):101:101 -> a
-    10:13:boolean lambda$isMaterializableInContext$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldResolutionResult):104:107 -> a
-    14:16:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):113:115 -> a
-    17:17:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():225:225 -> a
-    17:17:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):118 -> a
-    18:29:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):121:132 -> a
-    30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
-    30:30:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
-    30:30:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
-    30:30:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
+    8:12:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):93:97 -> a
+    13:13:boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):104:104 -> a
+    14:14:boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103:103 -> a
+    15:18:boolean lambda$internalIsMaterializableInContext$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldResolutionResult):106:109 -> a
+    19:21:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):115:117 -> a
+    22:22:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():225:225 -> a
+    22:22:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):120 -> a
+    23:34:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):123:134 -> a
+    35:35:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
+    35:35:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
+    35:35:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
+    35:35:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(3)"]}
-    30:30:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):132 -> a
-    31:31:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
-    31:31:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
-    31:31:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
-    31:31:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):132 -> a
-    32:32:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179:179 -> a
-    32:32:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
-    32:32:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):132 -> a
+    35:35:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):134 -> a
+    36:36:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    36:36:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
+    36:36:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
+    36:36:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):134 -> a
+    37:37:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179:179 -> a
+    37:37:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):194 -> a
+    37:37:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):134 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):35:35 -> b
     2:5:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):59:62 -> b
     6:6:boolean com.android.tools.r8.shaking.ObjectAllocationInfoCollectionUtils.mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement):20:20 -> b
@@ -46314,21 +46439,21 @@
     7:7:boolean com.android.tools.r8.shaking.ObjectAllocationInfoCollectionUtils.mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement):19:19 -> b
     7:7:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):63 -> b
     8:8:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):66:66 -> b
-    1:11:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):147:157 -> c
+    1:11:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):149:159 -> c
     com.android.tools.r8.ir.analysis.value.SingleFieldValue asSingleFieldValue() -> p
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState getObjectState() -> t
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.vX:
-    long value -> c
-    boolean $assertionsDisabled -> d
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.QX:
+    boolean $assertionsDisabled -> e
+    long value -> d
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(long):30:31 -> <init>
     1:1:boolean isTrue():56:56 -> D
-    1:2:boolean getBooleanValue():80:81 -> E
-    1:1:int getIntValue():93:93 -> F
-    1:1:long getValue():101:101 -> G
+    1:2:boolean getBooleanValue():80:81 -> F
+    1:1:int getIntValue():93:93 -> G
+    1:1:long getValue():101:101 -> H
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
+    boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
-    boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:1:int com.android.tools.r8.ir.analysis.value.SingleNumberValue.getIntValue():93:93 -> a
     1:1:boolean containsInt(int):36 -> a
@@ -46359,9 +46484,9 @@
     126:126:java.lang.String toString():125:125 -> toString
     1:1:boolean isFalse():51:51 -> x
     1:1:boolean isSingleBoolean():46:46 -> z
-com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.yX:
-    com.android.tools.r8.ir.analysis.value.objectstate.ObjectState state -> e
-    boolean $assertionsDisabled -> f
+com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.TX:
+    com.android.tools.r8.ir.analysis.value.objectstate.ObjectState state -> f
+    boolean $assertionsDisabled -> g
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):17:19 -> <init>
     1:5:boolean equals(java.lang.Object):49:53 -> equals
@@ -46379,7 +46504,7 @@
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue.getObjectState():39:39 -> u
     1:1:boolean hasKnownArrayLength():24 -> u
     2:2:boolean hasKnownArrayLength():24:24 -> u
-com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.zX:
+com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.UX:
     1:1:void <init>(com.android.tools.r8.graph.DexField):14:14 -> <init>
     1:5:boolean equals(java.lang.Object):34:38 -> equals
     1:1:int hashCode():43:43 -> hashCode
@@ -46392,16 +46517,16 @@
     33:33:java.lang.String toString():29:29 -> toString
     30:30:java.lang.String toString():29:29 -> toString
     boolean hasObjectState() -> v
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.AX:
-    com.android.tools.r8.graph.DexString string -> c
-    boolean $assertionsDisabled -> d
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.VX:
+    com.android.tools.r8.graph.DexString string -> d
+    boolean $assertionsDisabled -> e
     1:1:void <clinit>():26:26 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexString):31:32 -> <init>
     boolean isSingleStringValue() -> C
-    1:1:com.android.tools.r8.graph.DexString getDexString():46:46 -> E
+    1:1:com.android.tools.r8.graph.DexString getDexString():46:46 -> F
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
+    boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
-    boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:6:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):70:75 -> a
     7:16:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):73:82 -> a
@@ -46415,18 +46540,24 @@
     64:64:java.lang.String toString():61:61 -> toString
     65:65:java.lang.String toString():61:61 -> toString
     62:62:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.CX:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.XX:
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier) -> a
+    boolean internalIsMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> a
     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:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):18:18 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):18:18 -> b
+    2:3:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):51:52 -> b
+    4:4:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> b
+    4:4:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):52 -> b
+    5:6:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):52:53 -> b
     com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> c
     boolean isSingleValue() -> f
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> i
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.StatefulObjectValue -> com.android.tools.r8.internal.JY:
+com.android.tools.r8.ir.analysis.value.StatefulObjectValue -> com.android.tools.r8.internal.eZ:
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState state -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
@@ -46448,16 +46579,16 @@
     2:2:boolean hasKnownArrayLength():44:44 -> u
     boolean hasObjectState() -> v
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.B30:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.X30:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
-    1:1:com.android.tools.r8.ir.analysis.value.UnknownValue getInstance():18:18 -> E
+    1:1:com.android.tools.r8.ir.analysis.value.UnknownValue getInstance():18:18 -> F
     com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> b
     1:1:int hashCode():44:44 -> hashCode
     1:1:java.lang.String toString():49:49 -> toString
     boolean isNonTrivial() -> y
-com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState -> com.android.tools.r8.internal.Fi:
+com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState -> com.android.tools.r8.internal.Ji:
     com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -46467,7 +46598,7 @@
     boolean isEmpty() -> d
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.EmptyObjectState getInstance():23:23 -> e
     1:1:int hashCode():54:54 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState -> com.android.tools.r8.internal.Ej:
+com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState -> com.android.tools.r8.internal.Jj:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.analysis.value.objectstate.ObjectState[] state -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -46484,7 +46615,7 @@
     1:1:int getEnumValuesSize():44:44 -> e
     1:9:boolean equals(java.lang.Object):85:93 -> equals
     1:1:int hashCode():102:102 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.KnownLengthArrayState -> com.android.tools.r8.internal.AA:
+com.android.tools.r8.ir.analysis.value.objectstate.KnownLengthArrayState -> com.android.tools.r8.internal.GA:
     int length -> a
     1:2:void <init>(int):20:21 -> <init>
     void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
@@ -46494,7 +46625,7 @@
     boolean hasKnownArrayLength() -> c
     boolean isEmpty() -> d
     1:1:int hashCode():62:62 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.NonEmptyObjectState -> com.android.tools.r8.internal.qJ:
+com.android.tools.r8.ir.analysis.value.objectstate.NonEmptyObjectState -> com.android.tools.r8.internal.xJ:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -46507,7 +46638,7 @@
     boolean isEmpty() -> d
     1:11:boolean equals(java.lang.Object):58:68 -> equals
     1:1:int hashCode():77:77 -> hashCode
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectState -> com.android.tools.r8.internal.mM:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectState -> com.android.tools.r8.internal.DM:
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.ir.analysis.value.objectstate.EnumValuesObjectState asEnumValuesObjectState() -> a
     void forEachAbstractFieldValue(java.util.function.BiConsumer) -> a
@@ -46517,7 +46648,7 @@
     1:1:int getKnownArrayLength():68:68 -> b
     boolean hasKnownArrayLength() -> c
     boolean isEmpty() -> d
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder -> com.android.tools.r8.internal.lM:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder -> com.android.tools.r8.internal.CM:
     java.util.Map state -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():79:79 -> <clinit>
@@ -46527,7 +46658,7 @@
     5:5:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.empty():28:28 -> a
     5:5:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState build():91 -> a
     6:6:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState build():91:91 -> a
-com.android.tools.r8.ir.analysis.value.objectstate.ObjectStateAnalysis -> com.android.tools.r8.internal.nM:
+com.android.tools.r8.ir.analysis.value.objectstate.ObjectStateAnalysis -> com.android.tools.r8.internal.EM:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:boolean lambda$computeObjectState$0(com.android.tools.r8.ir.code.Instruction):25:25 -> a
@@ -46561,7 +46692,7 @@
     47:47:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):79 -> a
     48:55:void lambda$computeNewInstanceObjectState$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState$Builder,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):82:89 -> a
     1:1:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):23:23 -> b
-    2:2:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():204:204 -> b
+    2:2:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():205:205 -> b
     2:2:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):23 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):23:24 -> b
@@ -47052,7 +47183,7 @@
     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):22 -> b
     3:3:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):22:22 -> b
-com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.I4:
+com.android.tools.r8.ir.code.BasicBlock -> com.android.tools.r8.internal.K4:
     int color -> n
     int estimatedPredecessorsCount -> l
     int unfilledPredecessorsCount -> m
@@ -47438,13 +47569,13 @@
     1:1:java.util.List getPhis():667:667 -> x
     1:1:java.util.List getPredecessors():359:359 -> y
     1:1:java.util.List getSuccessors():296:296 -> z
-com.android.tools.r8.ir.code.BasicBlock$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.D4:
+com.android.tools.r8.ir.code.BasicBlock$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.F4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:3:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock$$InternalSyntheticOutline$166$b6dd67f260863294e1347834de9654f6bdbe9ba876ac452b76d49eee6a2321aa$0.m(com.android.tools.r8.ir.code.BasicBlock):0:2 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.E4:
+com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.G4:
     com.android.tools.r8.ir.code.Instruction next -> c
     com.android.tools.r8.ir.code.Instruction val$instruction -> d
     com.android.tools.r8.ir.code.InstructionIterator iterator -> b
@@ -47455,14 +47586,14 @@
     1:5:java.lang.Object next():723 -> next
     6:6:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():747:747 -> next
     6:6:java.lang.Object next():723 -> next
-com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.F4:
-com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.G4:
+com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.H4:
+com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.I4:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NON_EDGE -> b
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> c
     com.android.tools.r8.ir.code.BasicBlock$EdgeType EXCEPTIONAL -> d
     1:3:void <clinit>():128:130 -> <clinit>
     1:1:void <init>(java.lang.String,int):127:127 -> <init>
-com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.H4:
+com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.J4:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():2047:2047 -> <clinit>
     1:1:void <init>():2047:2047 -> <init>
@@ -47473,7 +47604,7 @@
     5:5:int doHash(java.lang.Object):2047:2047 -> a
     6:7:int com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doHash(com.android.tools.r8.ir.code.Phi):2062:2063 -> a
     6:7:int doHash(java.lang.Object):2047 -> a
-com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.K4:
+com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.M4:
     java.util.ListIterator instructionIterator -> b
     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>
@@ -47484,251 +47615,255 @@
     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.L4:
+com.android.tools.r8.ir.code.BasicBlockInstructionListIterator -> com.android.tools.r8.internal.N4:
     java.util.ListIterator listIterator -> c
     com.android.tools.r8.ir.code.Instruction current -> d
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.code.BasicBlock block -> b
     com.android.tools.r8.ir.code.IRMetadata metadata -> f
     com.android.tools.r8.ir.code.Position position -> e
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):47:47 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):43:50 -> <init>
-    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):53:53 -> <init>
-    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):43:56 -> <init>
-    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):61:62 -> <init>
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):46:46 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):42:49 -> <init>
+    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):52:52 -> <init>
+    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):42:55 -> <init>
+    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):60:61 -> <init>
     boolean lambda$inlineInvoke$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
     boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):104:104 -> a
-    2:12: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):137:147 -> a
-    13:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):224:224 -> a
+    1:1:void setInsertionPosition(com.android.tools.r8.ir.code.Position):103:103 -> a
+    2:12: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):136:146 -> a
+    13:13:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):223:223 -> a
     14:14:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():113:113 -> a
-    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):227 -> a
+    14:14:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):226 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    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:39:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):284:287 -> a
+    15:34:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):226:245 -> a
+    35:35:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):224:224 -> a
+    36:39:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):283:286 -> a
     40:40:com.android.tools.r8.ir.code.InvokeVirtual$Builder com.android.tools.r8.ir.code.InvokeVirtual.builder():37:37 -> a
-    40:40:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):287 -> a
-    41:42:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):288:289 -> a
+    40:40:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):286 -> a
+    41:42:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):287:288 -> a
     43:43:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):302:302 -> a
     43:43:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeVirtual$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):166 -> a
-    43:43:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):289 -> a
-    44:44:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):289:289 -> a
+    43:43:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):288 -> a
+    44:44:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):288:288 -> a
     45:45:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1668:1668 -> a
-    45:45:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):290 -> a
+    45:45:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):289 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     46:46:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1669:1669 -> a
-    46:46:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):290 -> a
-    47:51:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):290:294 -> a
-    52:61:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):302:311 -> a
+    46:46:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):289 -> a
+    47:51:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):289:293 -> a
+    52:61:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):301:310 -> a
     62:63:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):304:305 -> a
-    62:63:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):312 -> a
-    64:64:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    62:63:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):311 -> a
+    64:64:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     64:64:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):305 -> a
-    64:64:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):312 -> a
+    64:64:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):311 -> a
     65:68:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):306:309 -> a
-    65:68:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):312 -> a
+    65:68:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):311 -> a
     69:69:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
     69:69:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):310 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    69:69:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):312 -> a
+    69:69:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):311 -> a
     70:70:boolean com.android.tools.r8.graph.DexMethod.mustBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.AppView):311:311 -> a
-    70:70:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):312 -> a
-    71:83:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):316:328 -> a
-    84:86:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):338:340 -> a
+    70:70:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):311 -> a
+    71:83:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):315:327 -> a
+    84:86:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):334:336 -> a
     87:87:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
-    87:87:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):340 -> a
-    88:111:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):340:363 -> a
-    112:112:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
-    112:112:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):364 -> a
-    113:113:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):365:365 -> a
-    114:118: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):373:377 -> a
+    87:87:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):336 -> a
+    88:111:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):336:359 -> a
+    112:112:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    112:112:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):360 -> a
+    113:113:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):361:361 -> a
+    114:118: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):369:373 -> a
     119:119: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):411:411 -> a
-    119:119: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):377 -> a
-    120:121: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):378:379 -> a
+    119:119: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):373 -> a
+    120:121: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):374:375 -> a
     122:122:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):33:33 -> a
-    122:122: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):379 -> a
-    123:123:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
-    123:123: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):380 -> a
-    124:124: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):374:374 -> a
-    125:129:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):385:389 -> a
+    122:122: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):375 -> a
+    123:123:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    123:123: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):376 -> a
+    124:124: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):370:370 -> a
+    125:129:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):381:385 -> a
     130:130:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    130:130:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):389 -> a
-    131:134:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):389:392 -> a
-    135:135:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
-    135:135:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):393 -> a
-    136:136:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):386:386 -> a
-    137:146:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):410:419 -> a
+    130:130:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):385 -> a
+    131:134:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):385:388 -> a
+    135:135:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    135:135:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):389 -> a
+    136:136:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):382:382 -> a
+    137:146:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):406:415 -> a
     147:147:com.android.tools.r8.ir.code.InvokeVirtual$Builder com.android.tools.r8.ir.code.InvokeVirtual.builder():37:37 -> a
-    147:147:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):419 -> a
-    148:148:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):419:419 -> a
+    147:147:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):415 -> a
+    148:148:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):415:415 -> a
     149:149:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):302:302 -> a
     149:149:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeVirtual$Builder.setSingleArgument(com.android.tools.r8.ir.code.Value):166 -> a
-    149:149:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):419 -> a
-    150:150:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):419:419 -> a
-    151:151:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
-    151:151:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):418 -> a
-    152:152:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):411:411 -> a
-    153:161:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):425:433 -> a
-    162:162:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
-    162:162:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):434 -> a
-    163:164:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):437:438 -> a
-    165:165:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):426:426 -> a
-    166:194: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):450:478 -> a
-    195:195: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):477:477 -> a
-    196:213: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):476:493 -> a
-    214:214:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():99:99 -> a
-    214:214: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):494 -> a
-    215:219: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):495:499 -> a
+    149:149:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):415 -> a
+    150:150:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):415:415 -> a
+    151:151:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    151:151:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):414 -> a
+    152:152:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):407:407 -> a
+    153:161:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):421:429 -> a
+    162:162:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    162:162:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):430 -> a
+    163:164:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):433:434 -> a
+    165:165:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):422:422 -> a
+    166:194: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):446:474 -> a
+    195:195: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):473:473 -> a
+    196:213: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):472:489 -> a
+    214:214:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():98:98 -> a
+    214:214: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):490 -> a
+    215:219: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):491:495 -> a
     220:220:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
-    220:220: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):500 -> a
-    221:223: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):500:502 -> a
-    224:224: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:451 -> a
-    225:245:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):512:532 -> a
-    246:246:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():67:67 -> a
-    246:246:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):537 -> a
-    247:253:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):537:543 -> a
-    254:254:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):542:542 -> a
-    255:278:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):541:564 -> a
-    279:279:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():99:99 -> a
-    279: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):565 -> a
-    280:286:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):566:572 -> a
+    220:220: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):496 -> a
+    221:223: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):496:498 -> a
+    224:224: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):447:447 -> a
+    225:245:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):508:528 -> a
+    246:246:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():66:66 -> a
+    246:246:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):533 -> a
+    247:253:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):533:539 -> a
+    254:254:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):538:538 -> a
+    255:278:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):537:560 -> a
+    279:279:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():98:98 -> a
+    279: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):561 -> a
+    280:286:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):562:568 -> a
     287:287:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.Position.syntheticNone():117:117 -> a
-    287:287:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):573 -> a
-    288:315:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):573:600 -> a
-    316:316:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):513:513 -> a
-    317:326: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):584:593 -> a
-    327:328:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):608:609 -> a
-    329:329:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():67:67 -> a
-    329:329:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):612 -> a
-    330:333:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):612:615 -> a
+    287:287:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):569 -> a
+    288:315:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):569:596 -> a
+    316:316:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):509:509 -> a
+    317:326: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):580:589 -> a
+    327:328:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):604:605 -> a
+    329:329:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():66:66 -> a
+    329:329:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):608 -> a
+    330:333:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):608:611 -> a
     334:334:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1660:1660 -> a
-    334:334:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):615 -> a
+    334:334:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):611 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     335:335:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1660:1660 -> a
-    335:335:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):615 -> a
-    336:336:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):619:619 -> a
+    335:335:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):611 -> a
+    336:336:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):615:615 -> a
     337:337:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1225:1225 -> a
-    337:337:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):619 -> a
-    338:341:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):619:622 -> a
+    337:337:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):615 -> a
+    338:341:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):615:618 -> a
     342:343:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    342:343:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):622 -> a
-    344:362:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):623:641 -> a
-    363:370:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):650:657 -> a
-    371:374:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):665:668 -> a
-    375:407: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):694:726 -> a
-    408:413:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):764:769 -> a
-    414:421: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.DexProgramClass):780:787 -> a
-    422:424: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.DexProgramClass):786:788 -> a
-    425:427:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.canThrow(com.android.tools.r8.ir.code.IRCode):674:676 -> a
-    425:427: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.DexProgramClass):790 -> a
-    428:439: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.DexProgramClass):794:805 -> a
+    342:343:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):618 -> a
+    344:362:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):619:637 -> a
+    363:370:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):646:653 -> a
+    371:374:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):661:664 -> a
+    375:407: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):690:722 -> a
+    408:413:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):760:765 -> a
+    414:421: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.DexProgramClass):776:783 -> a
+    422:424: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.DexProgramClass):782:784 -> a
+    425:427:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.canThrow(com.android.tools.r8.ir.code.IRCode):670:672 -> a
+    425:427: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.DexProgramClass):786 -> a
+    428:439: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.DexProgramClass):790:801 -> a
     440:440:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():113:113 -> a
-    440:440: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.DexProgramClass):806 -> a
+    440:440: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.DexProgramClass):802 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    441:448: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.DexProgramClass):806:813 -> a
+    441:448: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.DexProgramClass):802:809 -> a
     449:449:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():113:113 -> a
-    449:449: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.DexProgramClass):816 -> a
+    449:449: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.DexProgramClass):812 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    450:486: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.DexProgramClass):816:852 -> a
+    450:486: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.DexProgramClass):812:848 -> a
     487:487:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():113:113 -> a
-    487:487: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.DexProgramClass):856 -> a
+    487:487: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.DexProgramClass):852 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    488: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.DexProgramClass):856:860 -> a
+    488: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.DexProgramClass):852:856 -> a
     493:493:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():113:113 -> 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.DexProgramClass):861 -> a
-    494:501: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.DexProgramClass):861:868 -> 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.DexProgramClass):857 -> a
+    494:501: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.DexProgramClass):857:864 -> a
     502:502:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
-    502:502: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.DexProgramClass):868 -> a
-    503:522: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.DexProgramClass):868:887 -> a
+    502:502: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.DexProgramClass):864 -> a
+    503:522: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.DexProgramClass):864:883 -> a
     523:523:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
-    523: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.DexProgramClass):887 -> a
-    524:524: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.DexProgramClass):890:890 -> a
+    523: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.DexProgramClass):883 -> a
+    524:524: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.DexProgramClass):886:886 -> a
     525:525:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    525:525: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.DexProgramClass):889 -> a
-    526: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.DexProgramClass):888:921 -> a
+    525:525: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.DexProgramClass):885 -> a
+    526: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.DexProgramClass):884:917 -> a
     560:560:com.android.tools.r8.ir.code.BasicBlockIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1085:1085 -> a
-    560:560: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.DexProgramClass):921 -> a
-    561:567: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.DexProgramClass):924:930 -> a
+    560:560: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.DexProgramClass):917 -> a
+    561:567: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.DexProgramClass):920:926 -> a
     568:568:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1225:1225 -> a
-    568:568: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.DexProgramClass):931 -> a
-    569:574: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.DexProgramClass):931:936 -> a
-    575:591: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):741:757 -> a
-    575:591: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.DexProgramClass):937 -> a
-    592:597: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.DexProgramClass):944:949 -> a
+    568:568: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.DexProgramClass):927 -> a
+    569:574: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.DexProgramClass):927:932 -> a
+    575:591: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):737:753 -> a
+    575:591: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.DexProgramClass):933 -> a
+    592:597: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.DexProgramClass):940:945 -> a
     598:598:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
-    598:598: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.DexProgramClass):949 -> a
-    599:609: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.DexProgramClass):949:959 -> a
-    610:614: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.DexProgramClass):958:962 -> a
-    615:621: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:974 -> a
+    598:598: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.DexProgramClass):945 -> a
+    599:609: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.DexProgramClass):945:955 -> a
+    610:614: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.DexProgramClass):954:958 -> a
+    615:621:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):964:970 -> a
     622:622:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1225:1225 -> a
-    622:622:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):975 -> a
+    622:622:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):971 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     623:623:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1225:1225 -> a
-    623:623:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):975 -> a
-    624:649:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):975:1000 -> a
+    623:623:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):971 -> a
+    624:649:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):971:996 -> a
     650:650:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
-    650:650:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):1000 -> a
-    651:668:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):1000:1017 -> a
+    650:650:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):996 -> a
+    651:668:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):996:1013 -> a
     669:669:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1183:1183 -> a
-    669:669: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
+    669:669: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
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    670:670:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():99:99 -> a
-    670:670: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 -> a
-    671:672: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:257 -> a
-    673:673:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1660:1660 -> a
-    673:673: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
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    674:674:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1660:1660 -> a
-    674:674: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
-    675:680: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
-    681:681: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):1211:1211 -> a
-    681:681: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
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    682:683: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):1216:1217 -> a
-    682:683: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):1211 -> a
-    682:683: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
+    670:670:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1187:1187 -> a
+    670:670:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1183 -> a
+    670:670: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
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    684:684: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
-    685:688: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
-    1:1:void add(java.lang.Object):38:38 -> add
-    1:7:void add(com.android.tools.r8.ir.code.Instruction):122:128 -> b
-    8:13:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):399:404 -> b
+    671:671:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():98:98 -> a
+    671:671: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
+    672:673: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
+    674:674:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1660:1660 -> a
+    674:674: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
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    675:675:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1660:1660 -> a
+    675:675: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
+    676:681: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
+    682:682: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):1211:1211 -> a
+    682:682: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
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    683:684: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):1216:1217 -> a
+    683:684: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):1211 -> a
+    683:684: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
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    685:685: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
+    686:689: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
+    1:1:void add(java.lang.Object):37:37 -> add
+    1:7:void add(com.android.tools.r8.ir.code.Instruction):121:127 -> b
+    8:13:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):395:400 -> b
     14:15: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):1216:1217 -> b
-    14:15:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):404 -> b
-    16:16:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> b
-    16:16:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):405 -> b
-    17:17:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):400:400 -> b
-    1:7:void removeOrReplaceByDebugLocalRead():212:218 -> e
-    8:8:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> e
-    8:8:void removeOrReplaceByDebugLocalRead():218 -> e
-    9:9:void removeOrReplaceByDebugLocalRead():213:213 -> e
-    1:1:void unsetInsertionPosition():109:109 -> h
-    1:1:boolean hasNext():67:67 -> hasNext
-    1:1:boolean hasPrevious():83:83 -> hasPrevious
-    1:5:void removeInstructionIgnoreOutValue():203:207 -> i
-    6:6:void removeInstructionIgnoreOutValue():204:204 -> i
-    1:1:com.android.tools.r8.ir.code.Instruction next():72:72 -> j
-    1:1:java.lang.Object next():38:38 -> next
-    1:1:int nextIndex():78:78 -> nextIndex
-    1:1:java.lang.Object previous():38:38 -> previous
-    2:2:com.android.tools.r8.ir.code.Instruction previous():88:88 -> previous
-    1:1:int previousIndex():94:94 -> previousIndex
-    1:6:void remove():178:183 -> remove
+    14:15:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):400 -> b
+    16:16:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
+    16:16:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):401 -> b
+    17:17:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):396:396 -> b
+    1:7:void removeOrReplaceByDebugLocalRead():211:217 -> e
+    8:8:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> e
+    8:8:void removeOrReplaceByDebugLocalRead():217 -> e
+    9:9:void removeOrReplaceByDebugLocalRead():212:212 -> e
+    1:1:void unsetInsertionPosition():108:108 -> h
+    1:1:boolean hasNext():66:66 -> hasNext
+    1:1:boolean hasPrevious():82:82 -> hasPrevious
+    1:5:void removeInstructionIgnoreOutValue():202:206 -> i
+    6:6:void removeInstructionIgnoreOutValue():203:203 -> i
+    1:1:com.android.tools.r8.ir.code.Instruction next():71:71 -> j
+    1:1:java.lang.Object next():37:37 -> next
+    1:1:int nextIndex():77:77 -> nextIndex
+    1:1:java.lang.Object previous():37:37 -> previous
+    2:2:com.android.tools.r8.ir.code.Instruction previous():87:87 -> previous
+    1:1:int previousIndex():93:93 -> previousIndex
+    1:6:void remove():177:182 -> remove
     7:7:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():113:113 -> remove
-    7:7:void remove():183 -> remove
+    7:7:void remove():182 -> remove
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:9:void remove():183:184 -> remove
+    8:9:void remove():182:183 -> remove
     10:10:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():113:113 -> remove
-    10:10:void remove():184 -> remove
+    10:10:void remove():183 -> remove
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:25:void remove():184:198 -> remove
-    26:26:void remove():179:179 -> remove
-    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.N4:
+    11:25:void remove():183:197 -> remove
+    26:26:void remove():178:178 -> remove
+    1:1:void set(java.lang.Object):37:37 -> set
+    2:5:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):160:163 -> set
+    2:5:void set(java.lang.Object):37 -> set
+com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.P4:
     java.util.ListIterator listIterator -> c
     com.android.tools.r8.ir.code.IRCode code -> b
     com.android.tools.r8.ir.code.BasicBlock current -> d
@@ -47750,7 +47885,7 @@
     1:1:void set(java.lang.Object):11:11 -> set
     2:2:void com.android.tools.r8.ir.code.BasicBlockIterator.set(com.android.tools.r8.ir.code.BasicBlock):78:78 -> set
     2:2:void set(java.lang.Object):11 -> set
-com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.i5:
+com.android.tools.r8.ir.code.Binop -> com.android.tools.r8.internal.k5:
     com.android.tools.r8.ir.code.NumericType type -> i
     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() -> X0
@@ -47777,7 +47912,7 @@
     1:2:int maxInOutValueRegisterSize():82:83 -> r2
     1:1:com.android.tools.r8.ir.code.Value rightValue():44:44 -> s2
     com.android.tools.r8.ir.code.Binop asBinop() -> u
-com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.N6:
+com.android.tools.r8.ir.code.CanonicalPositions -> com.android.tools.r8.internal.P6:
     java.util.Map canonicalPositions -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.Position callerPosition -> a
@@ -47798,7 +47933,7 @@
     45:45:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):126 -> a
     46:49:com.android.tools.r8.ir.code.Position getExceptionalExitPosition(boolean,java.util.function.Supplier,com.android.tools.r8.graph.DexMethod):126:129 -> a
     1:1:com.android.tools.r8.ir.code.Position getCanonical(com.android.tools.r8.ir.code.Position):63:63 -> b
-com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.Q6:
+com.android.tools.r8.ir.code.CatchHandlers -> com.android.tools.r8.internal.S6:
     java.util.List guards -> b
     java.util.Set uniqueTargets -> d
     java.util.List targets -> c
@@ -47827,18 +47962,18 @@
     1:1:int hashCode():144:144 -> hashCode
     1:1:java.util.Iterator iterator():111:111 -> iterator
     1:2:int size():59:60 -> size
-com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.O6:
+com.android.tools.r8.ir.code.CatchHandlers$1 -> com.android.tools.r8.internal.Q6:
     com.android.tools.r8.ir.code.CatchHandlers this$0 -> c
     int nextIndex -> b
     1:3:void <init>(com.android.tools.r8.ir.code.CatchHandlers):111:113 -> <init>
     1:1:boolean hasNext():117:117 -> hasNext
     1:4:com.android.tools.r8.ir.code.CatchHandlers$CatchHandler com.android.tools.r8.ir.code.CatchHandlers$1.next():122:125 -> next
     1:4:java.lang.Object next():111 -> next
-com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.P6:
+com.android.tools.r8.ir.code.CatchHandlers$CatchHandler -> com.android.tools.r8.internal.R6:
     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.I9:
+com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.L9:
     int $r8$clinit -> l
     com.android.tools.r8.graph.DexType type -> i
     boolean ignoreCompatRules -> j
@@ -47890,7 +48025,7 @@
     boolean isCheckCast() -> r1
     1:1:java.lang.String toString():201:201 -> toString
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> v
-com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.H9:
+com.android.tools.r8.ir.code.CheckCast$Builder -> com.android.tools.r8.internal.K9:
     com.android.tools.r8.ir.code.Value object -> d
     com.android.tools.r8.graph.DexType castType -> c
     1:1:void <init>():281:281 -> <init>
@@ -47901,7 +48036,7 @@
     3:3:void com.android.tools.r8.ir.code.CheckCast.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):41:41 -> b
     3:3:com.android.tools.r8.ir.code.CheckCast build():298 -> b
     4:4:com.android.tools.r8.ir.code.CheckCast build():298:298 -> b
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.Qb:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.Tb:
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.Cmp$Bias bias -> j
     1:1:void <clinit>():27:27 -> <clinit>
@@ -47978,12 +48113,12 @@
     166:166:java.lang.String toString():111 -> toString
     167:188:java.lang.String toString():111:132 -> toString
     com.android.tools.r8.ir.code.Cmp asCmp() -> w
-com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.Ob:
+com.android.tools.r8.ir.code.Cmp$1 -> com.android.tools.r8.internal.Rb:
     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>():91:91 -> <clinit>
     2:2:void <clinit>():61:61 -> <clinit>
-com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.Pb:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.Sb:
     com.android.tools.r8.ir.code.Cmp$Bias GT -> c
     com.android.tools.r8.ir.code.Cmp$Bias[] $VALUES -> e
     com.android.tools.r8.ir.code.Cmp$Bias LT -> d
@@ -47992,7 +48127,7 @@
     2:2:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(java.lang.String,int):29:29 -> <init>
     1:1:com.android.tools.r8.ir.code.Cmp$Bias[] values():29:29 -> a
-com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.Id:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.Ld:
     com.android.tools.r8.graph.DexType clazz -> j
     int $r8$clinit -> m
     boolean ignoreCompatRules -> k
@@ -48042,7 +48177,7 @@
     1:1:com.android.tools.r8.graph.DexType getValue():77:77 -> p2
     1:1:java.lang.String toString():104:104 -> toString
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> x
-com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.Hd:
+com.android.tools.r8.ir.code.ConstClass$Builder -> com.android.tools.r8.internal.Kd:
     com.android.tools.r8.graph.DexType type -> c
     1:1:void <init>():216:216 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
@@ -48051,7 +48186,7 @@
     2:2:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):33:33 -> b
     2:2:com.android.tools.r8.ir.code.ConstClass build():227 -> b
     3:3:com.android.tools.r8.ir.code.ConstClass build():227:227 -> b
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.Jd:
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.Md:
     int $r8$clinit -> i
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> S0
@@ -48061,7 +48196,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isConstInstruction() -> t1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> y
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.Ld:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.Od:
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():22:22 -> <clinit>
@@ -48094,7 +48229,7 @@
     1:1:com.android.tools.r8.graph.DexMethodHandle getValue():56:56 -> o2
     1:1:java.lang.String toString():94:94 -> toString
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> z
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.Md:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.Pd:
     com.android.tools.r8.graph.DexProto methodType -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():22:22 -> <clinit>
@@ -48126,7 +48261,7 @@
     int maxOutValueRegister() -> k2
     int opcode() -> l2
     1:1:java.lang.String toString():88:88 -> toString
-com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.Od:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.Rd:
     long value -> j
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
@@ -48196,10 +48331,10 @@
     1:1:boolean isZero():111:111 -> x2
     1:1:boolean negativeIs16Bit():292:292 -> y2
     1:1:boolean negativeIs8Bit():284:284 -> z2
-com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.Nd:
+com.android.tools.r8.ir.code.ConstNumber$1 -> com.android.tools.r8.internal.Qd:
     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.Qd:
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.Td:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.DexString value -> j
@@ -48217,10 +48352,10 @@
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72 -> a
     6:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):72:73 -> 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):135:135 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     9:9:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     10:10:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135 -> a
     11:14:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):135:138 -> 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):136:136 -> a
@@ -48242,7 +48377,7 @@
     int opcode() -> l2
     1:1:com.android.tools.r8.graph.DexString getValue():62:62 -> o2
     1:1:java.lang.String toString():94:94 -> toString
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.Yd:
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.be:
     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
@@ -48286,7 +48421,7 @@
     43:43:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     43:43:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):55 -> a
     44:44: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.df:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.hf:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> X0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -48303,11 +48438,11 @@
     1:1:int maxInValueRegister():60:60 -> j2
     1:1:int maxOutValueRegister():65:65 -> k2
     int opcode() -> l2
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.ef:
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.if:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     boolean isAllowedAfterThrowingInstruction() -> h1
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.ff:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.jf:
     boolean $assertionsDisabled -> j
     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>
@@ -48321,7 +48456,7 @@
     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
     boolean isAllowedAfterThrowingInstruction() -> h1
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.gf:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.kf:
     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 -> k
@@ -48354,7 +48489,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getEnding():44:44 -> o2
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():48:48 -> p2
     1:6:java.lang.String toString():93:98 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.hf:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.lf:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -48366,7 +48501,7 @@
     2:2:boolean com.android.tools.r8.ir.code.Position.isSyntheticPosition():0:0 -> a
     2:2:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45 -> a
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):45:45 -> a
-    4:4:void com.android.tools.r8.ir.conversion.DexBuilder.addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):655:655 -> a
+    4:4:void com.android.tools.r8.ir.conversion.DexBuilder.addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):684:684 -> a
     4:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):46 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:72 -> a
@@ -48384,7 +48519,7 @@
     1:1:int maxInValueRegister():56:56 -> j2
     1:1:int maxOutValueRegister():61:61 -> k2
     int opcode() -> l2
-com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.mf:
+com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.qf:
     com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
@@ -48397,13 +48532,13 @@
     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.vf:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.zf:
     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
     java.lang.Object com.android.tools.r8.ir.code.InstructionVisitor.visit(com.android.tools.r8.ir.code.NewUnboxedEnumInstance) -> a
     java.lang.Object com.android.tools.r8.ir.code.InstructionVisitor.visit(com.android.tools.r8.ir.code.NewInstance) -> a
-com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.ch:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.gh:
     int $r8$clinit -> m
     com.android.tools.r8.graph.DexReference item -> j
     boolean $assertionsDisabled -> l
@@ -48440,7 +48575,7 @@
     1:1:com.android.tools.r8.graph.DexReference getItem():59:59 -> o2
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():63:63 -> p2
     1:1:java.lang.String toString():109:109 -> toString
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.Vh:
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.Zh:
     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):25:25 -> <init>
     com.android.tools.r8.ir.code.Div asDiv() -> G
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -48470,7 +48605,7 @@
     int opcode() -> l2
     boolean isCommutative() -> p2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():149:149 -> t2
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.Yh:
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.ci:
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> a
     com.android.tools.r8.ir.code.BasicBlock[] doms -> b
     boolean obsolete -> e
@@ -48522,7 +48657,7 @@
     319:319:java.lang.String toString():308:308 -> toString
     320:320:java.lang.String toString():309:309 -> toString
     311:317:java.lang.String toString():310:316 -> toString
-com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.Wh:
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.ai:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> c
     com.android.tools.r8.ir.code.BasicBlock current -> b
     boolean $assertionsDisabled -> d
@@ -48531,11 +48666,11 @@
     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$Inclusive -> com.android.tools.r8.internal.Xh:
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.bi:
     com.android.tools.r8.ir.code.DominatorTree$Inclusive NO -> b
     1:1:void <clinit>():25: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.ji:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.ni:
     boolean $assertionsDisabled -> i
     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>
@@ -48563,7 +48698,7 @@
     1:1:com.android.tools.r8.ir.code.StackValue outTop():57 -> p2
     2:2:com.android.tools.r8.ir.code.StackValue outTop():57:57 -> p2
     1:1:com.android.tools.r8.ir.code.StackValue src():61:61 -> q2
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.ii:
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.mi:
     boolean $assertionsDisabled -> i
     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>
@@ -48583,47 +48718,46 @@
     int maxInValueRegister() -> j2
     1:1:int maxOutValueRegister():104:104 -> k2
     int opcode() -> l2
-com.android.tools.r8.ir.code.FieldGet -> com.android.tools.r8.internal.uk:
+com.android.tools.r8.ir.code.FieldGet -> com.android.tools.r8.internal.zk:
     com.android.tools.r8.ir.analysis.type.TypeElement getOutType() -> a
     com.android.tools.r8.ir.code.Value outValue() -> b
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.xk:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.Ck:
     com.android.tools.r8.graph.DexField field -> i
     boolean $assertionsDisabled -> j
-    1:1:void <clinit>():30:30 -> <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):35:35 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):39:41 -> <init>
+    1:1:void <clinit>():31:31 -> <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):36:36 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,java.util.List):40:42 -> <init>
     boolean isFieldInstruction() -> B1
     com.android.tools.r8.ir.code.FieldInstruction asFieldInstruction() -> J
     boolean hasInvariantOutType() -> X0
-    1:16: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):80:95 -> a
+    1:16: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):81:96 -> a
     17:17:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    17:17: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):101 -> a
-    18:42: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):101:125 -> a
-    43:76:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):173:206 -> a
-    77:79:boolean com.android.tools.r8.graph.DexEncodedMethod.isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):360:362 -> a
-    77:79:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):207 -> a
-    80:80:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):210:210 -> a
-    81:81:boolean com.android.tools.r8.shaking.ObjectAllocationInfoCollectionUtils.mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement):20:20 -> a
-    81:81:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):210 -> a
-    82:82:boolean com.android.tools.r8.shaking.ObjectAllocationInfoCollectionUtils.mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement):19:19 -> a
-    82:82:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):210 -> a
-    83:88:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):216:221 -> a
-    1:1:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):66:66 -> b
-    2:2:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):72:72 -> b
-    2:2:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):66 -> b
+    17:17: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):102 -> a
+    18:35: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):102:119 -> a
+    36:36:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):53:53 -> a
+    36:36: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):119 -> a
+    37:37:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    37:37:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):53 -> a
+    37:37: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):119 -> a
+    38:38: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):123:123 -> a
+    39:72:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):171:204 -> a
+    73:75:boolean com.android.tools.r8.graph.DexEncodedMethod.isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):360:362 -> a
+    73:75:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):205 -> a
+    76:76:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):208:208 -> a
+    77:77:boolean com.android.tools.r8.shaking.ObjectAllocationInfoCollectionUtils.mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement):20:20 -> a
+    77:77:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):208 -> a
+    78:78:boolean com.android.tools.r8.shaking.ObjectAllocationInfoCollectionUtils.mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement):19:19 -> a
+    78:78:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):208 -> a
+    79:84:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):214:219 -> a
+    1:1:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> 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):73:73 -> 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):248:248 -> b
-    3:3:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):72 -> b
-    3:3:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):66 -> b
-    4:4:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):71:71 -> b
-    4:4:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):66 -> 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):72:72 -> b
-    6:6: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):248:248 -> b
-    6:6:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):72 -> b
-    7:7: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
-    1:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):140:163 -> f
-    1:1:com.android.tools.r8.graph.DexField getField():51:51 -> getField
-    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():47:47 -> o2
-com.android.tools.r8.ir.code.FieldMemberType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.yk:
+    3:3:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):73 -> 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):72:72 -> b
+    1:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):138:161 -> f
+    1:1:com.android.tools.r8.graph.DexField getField():52:52 -> getField
+    1:1:com.android.tools.r8.ir.code.FieldMemberType getType():48:48 -> o2
+com.android.tools.r8.ir.code.FieldMemberType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Dk:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
@@ -48633,11 +48767,11 @@
     2:2:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromDexType(com.android.tools.r8.graph.DexType):51 -> a
     3:3:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromTypeDescriptorChar(char):44:44 -> a
     3:3:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromDexType(com.android.tools.r8.graph.DexType):51 -> a
-com.android.tools.r8.ir.code.FieldPut -> com.android.tools.r8.internal.Gk:
+com.android.tools.r8.ir.code.FieldPut -> com.android.tools.r8.internal.Lk:
     void setValue(com.android.tools.r8.ir.code.Value) -> a
     boolean isStaticPut() -> c
     int getValueIndex() -> e
-com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.hl:
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.ml:
     int register -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():12:12 -> <clinit>
@@ -48666,7 +48800,7 @@
     78:78:java.lang.String toString():75:75 -> toString
     79:79:java.lang.String toString():75:75 -> toString
     76:76:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.Om:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.Tm:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -48689,7 +48823,7 @@
     83:83:java.lang.String toString():78:78 -> toString
     84:84:java.lang.String toString():78:78 -> toString
     85:85:java.lang.String toString():78:78 -> toString
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.go:
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.lo:
     boolean $assertionsDisabled -> m
     int nextInstructionNumber -> i
     int usedMarkingColors -> g
@@ -48815,8 +48949,9 @@
     726:726:com.android.tools.r8.ir.code.BasicBlockIterator listIterator(int):1085:1085 -> a
     727:727:java.util.Iterator argumentIterator():1116:1116 -> a
     728:728:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1179:1179 -> a
-    729:729:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1187:1187 -> a
-    730:730:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1203:1203 -> a
+    729:729:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1203:1203 -> a
+    730:730:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1187:1187 -> a
+    730:730:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1203 -> a
     731:734:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1272:1275 -> a
     735:740:boolean com.android.tools.r8.ir.code.IRCode.isDeadPhi(com.android.tools.r8.utils.WorkList):1288:1293 -> a
     735:740:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1276 -> a
@@ -49086,7 +49221,8 @@
     34:34:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):1021:1021 -> f
     1:1:com.android.tools.r8.graph.ProgramMethod context():164:164 -> g
     1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1238:1238 -> 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):1183:1183 -> 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,com.android.tools.r8.graph.DebugLocalInfo):1187:1187 -> 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):1183 -> h
     2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1238 -> h
     1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():173:173 -> i
     1:1:com.android.tools.r8.ir.conversion.MethodConversionOptions getConversionOptions():186:186 -> j
@@ -49129,7 +49265,7 @@
     3:10:int reserveMarkingColor():1299:1306 -> z
     11:12:boolean com.android.tools.r8.ir.code.IRCode.verifyNoBlocksMarked(int):525:526 -> z
     11:12:int reserveMarkingColor():1307 -> z
-com.android.tools.r8.ir.code.IRCode$1 -> com.android.tools.r8.internal.do:
+com.android.tools.r8.ir.code.IRCode$1 -> com.android.tools.r8.internal.io:
     com.android.tools.r8.ir.code.Argument next -> c
     com.android.tools.r8.ir.code.InstructionIterator instructionIterator -> b
     1:4:void <init>(com.android.tools.r8.ir.code.IRCode):1116:1119 -> <init>
@@ -49138,10 +49274,10 @@
     1:5:java.lang.Object next():1116 -> next
     6:6:com.android.tools.r8.ir.code.Argument com.android.tools.r8.ir.code.IRCode$1.next():1129:1129 -> next
     6:6:java.lang.Object next():1116 -> next
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.eo:
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.jo:
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):108:109 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.fo:
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.ko:
     java.util.Deque liveStackValues -> c
     java.util.Set liveLocalValues -> b
     java.util.LinkedHashSet liveValues -> a
@@ -49150,7 +49286,7 @@
     1:5:void <init>(java.util.LinkedHashSet,java.util.Set,java.util.Deque):81:85 -> <init>
     1:2:boolean equals(java.lang.Object):95:96 -> equals
     1:1:int hashCode():90:90 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.ho:
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.mo:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
@@ -49165,54 +49301,54 @@
     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.io:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.no:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
     boolean $assertionsDisabled -> e
-    1:1:void <clinit>():23:23 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.code.IRCode):30:33 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):39:39 -> a
-    2:2:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):44:44 -> a
-    3:3:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):54:54 -> a
-    4:4:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):61:61 -> a
-    5:5:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):70:70 -> a
-    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):77:77 -> a
-    7:7:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):82:82 -> a
-    8:8:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):93:93 -> a
-    9:9:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):99:99 -> a
-    10:10: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):116:116 -> a
-    11:11:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):126:126 -> a
-    12:12:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):132:132 -> a
-    13:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):137:137 -> a
-    14:14:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):143:143 -> a
-    15:15: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.DexProgramClass):154:154 -> a
-    16:16: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):215:215 -> a
-    17:17:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):231:231 -> a
-    18:18:void setInsertionPosition(com.android.tools.r8.ir.code.Position):246:246 -> a
-    1:1:void add(java.lang.Object):23:23 -> add
-    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):206:206 -> add
-    2:2:void add(java.lang.Object):23 -> add
-    1:1:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):88:88 -> b
-    1:1:void removeOrReplaceByDebugLocalRead():236:236 -> e
-    1:1:void unsetInsertionPosition():251:251 -> h
-    1:1:boolean hasNext():159:159 -> hasNext
-    1:1:boolean hasPrevious():177:177 -> hasPrevious
-    1:1:void removeInstructionIgnoreOutValue():105:105 -> i
-    1:9:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():164:172 -> next
-    1:9:java.lang.Object next():23 -> next
-    10:10:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():168:168 -> next
-    10:10:java.lang.Object next():23 -> next
-    1:1:int nextIndex():196:196 -> nextIndex
-    1:1:java.lang.Object previous():23:23 -> previous
-    2:11:com.android.tools.r8.ir.code.Instruction previous():182:191 -> previous
-    12:12:com.android.tools.r8.ir.code.Instruction previous():186:186 -> previous
-    1:1:int previousIndex():201:201 -> previousIndex
-    1:1:void remove():221:221 -> remove
-    1:1:void set(java.lang.Object):23:23 -> set
-    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):226:226 -> set
-    2:2:void set(java.lang.Object):23 -> set
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.mo:
+    1:1:void <clinit>():22:22 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.code.IRCode):29:32 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):38:38 -> a
+    2:2:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):43:43 -> a
+    3:3:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):53:53 -> a
+    4:4:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):60:60 -> a
+    5:5:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):66:66 -> a
+    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):73:73 -> a
+    7:7:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):78:78 -> a
+    8:8:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):89:89 -> a
+    9:9:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):95:95 -> a
+    10:10: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):112:112 -> a
+    11:11:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):122:122 -> a
+    12:12:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):128:128 -> a
+    13:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):133:133 -> a
+    14:14: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
+    15:15: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.DexProgramClass):150:150 -> a
+    16:16: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):211:211 -> a
+    17:17:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):227:227 -> a
+    18:18:void setInsertionPosition(com.android.tools.r8.ir.code.Position):242:242 -> 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):202:202 -> 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):84:84 -> b
+    1:1:void removeOrReplaceByDebugLocalRead():232:232 -> e
+    1:1:void unsetInsertionPosition():247:247 -> h
+    1:1:boolean hasNext():155:155 -> hasNext
+    1:1:boolean hasPrevious():173:173 -> hasPrevious
+    1:1:void removeInstructionIgnoreOutValue():101:101 -> i
+    1:9:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():160:168 -> 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():164:164 -> next
+    10:10:java.lang.Object next():22 -> next
+    1:1:int nextIndex():192:192 -> nextIndex
+    1:1:java.lang.Object previous():22:22 -> previous
+    2:11:com.android.tools.r8.ir.code.Instruction previous():178:187 -> previous
+    12:12:com.android.tools.r8.ir.code.Instruction previous():182:182 -> previous
+    1:1:int previousIndex():197:197 -> previousIndex
+    1:1:void remove():217:217 -> 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):222:222 -> set
+    2:2:void set(java.lang.Object):22 -> set
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.ro:
     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
@@ -49230,7 +49366,7 @@
     76:76:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():113:113 -> a
     76:76:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148 -> a
     77:80:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148:151 -> a
-com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.qo:
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.vo:
     long second -> b
     long first -> a
     boolean $assertionsDisabled -> c
@@ -49347,7 +49483,7 @@
     1:1:boolean mayHaveInvokeSuper():206:206 -> x
     1:1:boolean mayHaveInvokeVirtual():210:210 -> y
     1:1:boolean mayHaveMonitorInstruction():214:214 -> z
-com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.Jo:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.Oo:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     com.android.tools.r8.ir.code.If$Type type -> j
@@ -49415,10 +49551,10 @@
     1:2:com.android.tools.r8.ir.code.Value rhs():110:111 -> u2
     1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():236:238 -> v2
     1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNullObject():242:244 -> w2
-com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.Io:
+com.android.tools.r8.ir.code.If$1 -> com.android.tools.r8.internal.No:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():28:28 -> <clinit>
-com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.Jo$a:
+com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.Oo$a:
     com.android.tools.r8.ir.code.If$Type GE -> c
     com.android.tools.r8.ir.code.If$Type GT -> d
     com.android.tools.r8.ir.code.If$Type EQ -> b
@@ -49441,10 +49577,10 @@
     19:27:com.android.tools.r8.ir.code.If$Type inverted():50:58 -> b
     28:28:com.android.tools.r8.ir.code.If$Type inverted():48:48 -> b
     1:1:com.android.tools.r8.ir.code.If$Type[] values():23:23 -> c
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.Jp:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.Op:
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
     com.android.tools.r8.ir.code.MemberType getMemberType() -> d
-com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.Np:
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.Sp:
     boolean $assertionsDisabled -> j
     int increment -> i
     1:1:void <clinit>():20:20 -> <clinit>
@@ -49460,7 +49596,7 @@
     int maxOutValueRegister() -> k2
     int opcode() -> l2
     1:1:java.lang.String toString():106:106 -> toString
-com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.fq:
+com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.kq:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -49488,16 +49624,16 @@
     1:1:com.android.tools.r8.ir.code.InitClass$Builder builder():39:39 -> o2
     1:1:com.android.tools.r8.graph.DexType getClassValue():43:43 -> p2
     1:1:java.lang.String toString():171:171 -> toString
-com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.eq:
+com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.jq:
     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>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.InitClass$Builder setType(com.android.tools.r8.graph.DexType):181:181 -> a
     1:1:com.android.tools.r8.ir.code.InitClass build():187:187 -> b
-com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.Qq:
+com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.Vq:
     com.android.tools.r8.ir.code.Value object() -> i
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.Tq:
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.Yq:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():36:36 -> <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):39:39 -> <init>
@@ -49552,7 +49688,7 @@
     boolean throwsOnNullInput() -> n2
     1:1:java.lang.String toString():183:183 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():69:69 -> value
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.cr:
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.hr:
     com.android.tools.r8.graph.DexType type -> i
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):26:27 -> <init>
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> Q
@@ -49577,7 +49713,7 @@
     1:1:com.android.tools.r8.graph.DexType type():41:41 -> o2
     1:2:java.lang.String toString():128:129 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():49:49 -> value
-com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.dr:
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.ir:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():37:37 -> <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):40:40 -> <init>
@@ -49630,7 +49766,7 @@
     boolean throwsOnNullInput() -> n2
     1:1:java.lang.String toString():236:236 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():81:81 -> value
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.nr:
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.sr:
     com.android.tools.r8.ir.code.Position position -> g
     java.util.List inValues -> c
     java.util.Set debugValues -> f
@@ -49782,7 +49918,7 @@
     720:720:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):558:558 -> a
     720:720:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):480 -> a
     720:720:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):528 -> a
-    721:721:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
+    721:721:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():791:791 -> a
     721:721:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):558 -> a
     721:721:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):480 -> a
     721:721:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):528 -> a
@@ -49795,7 +49931,7 @@
     730:730:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):568 -> a
     730:730:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):484 -> a
     730:730:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):528 -> a
-    731:731:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
+    731:731:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():791:791 -> a
     731:731:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):558 -> a
     731:731:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):568 -> a
     731:731:boolean com.android.tools.r8.ir.code.Instruction.identicalOutputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):484 -> a
@@ -49810,7 +49946,7 @@
     770:770:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):558:558 -> a
     770:770:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):435 -> a
     770:770:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):542 -> a
-    771:771:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
+    771:771:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():791:791 -> a
     771:771:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):558 -> a
     771:771:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):435 -> a
     771:771:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):542 -> a
@@ -49823,7 +49959,7 @@
     780:780:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):568 -> a
     780:780:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):439 -> a
     780:780:boolean identicalAfterRegisterAllocation(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):542 -> a
-    781:781:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
+    781:781:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():791:791 -> a
     781:781:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuePair(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue):558 -> a
     781:781:boolean com.android.tools.r8.ir.code.Instruction.identicalStackValuesPair(com.android.tools.r8.ir.code.StackValues,com.android.tools.r8.ir.code.StackValues):568 -> a
     781:781:boolean com.android.tools.r8.ir.code.Instruction.identicalInputAfterRegisterAllocation(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.regalloc.RegisterAllocator):439 -> a
@@ -50000,7 +50136,7 @@
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> z
     com.android.tools.r8.ir.code.Shl asShl() -> z0
     boolean isDebugPosition() -> z1
-com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.gr:
+com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.lr:
     com.android.tools.r8.ir.code.Position position -> b
     com.android.tools.r8.ir.code.Value outValue -> a
     1:1:void <init>():1638:1638 -> <init>
@@ -50014,7 +50150,7 @@
     1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1673:1673 -> b
     2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1668:1669 -> b
     2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1673 -> b
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.mr:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.rr:
     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 IGNORE_RECEIVER_FIELD_ASSIGNMENTS -> c
@@ -50026,26 +50162,26 @@
     boolean canAssumeInvokedMethodDoesNotHaveSideEffects() -> b
     boolean canAssumeReceiverIsNotNull() -> c
     1:1:com.android.tools.r8.ir.code.Instruction$SideEffectAssumption join(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1615:1615 -> d
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.hr:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.mr:
     1:1:void <init>():1563:1563 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.ir:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.nr:
     1:1:void <init>():1572:1572 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.jr:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.or:
     1:1:void <init>():1581:1581 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.kr:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.pr:
     1:1:void <init>():1590:1590 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$5 -> com.android.tools.r8.internal.lr:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$5 -> com.android.tools.r8.internal.qr:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption val$other -> f
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption this$0 -> g
     1:1616:void <init>(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):0:1615 -> <init>
     1:2:boolean canAssumeClassIsAlreadyInitialized():1619:1620 -> a
     1:2:boolean canAssumeInvokedMethodDoesNotHaveSideEffects():1625:1626 -> b
     1:2:boolean canAssumeReceiverIsNotNull():1631:1632 -> c
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.pr:
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.ur:
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> d
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> f
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.qr:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.vr:
     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.DexProgramClass) -> 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
@@ -50064,29 +50200,29 @@
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean) -> a
     com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions) -> a
-    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
-    2:2:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):91:91 -> a
-    3:3:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):95:95 -> a
-    4:4:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):116:116 -> a
-    5:5:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):115:115 -> a
-    6:6:void replaceCurrentInstructionWithConstTrue(com.android.tools.r8.ir.code.IRCode):137:137 -> a
-    7:7:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):143:143 -> a
-    8:8:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):142:142 -> a
-    9:9:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):199:199 -> 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):281:283 -> a
+    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    2:2:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):90:90 -> a
+    3:3:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):94:94 -> a
+    4:4:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):115:115 -> a
+    5:5:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):114:114 -> a
+    6:6:void replaceCurrentInstructionWithConstTrue(com.android.tools.r8.ir.code.IRCode):133:133 -> a
+    7:7:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):139:139 -> a
+    8:8:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.lang.String):138:138 -> a
+    9:9:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):195:195 -> 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):277:279 -> a
     void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString) -> b
-    1:1:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):203:203 -> b
-    2:2:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):233:233 -> b
-    1:1:void replaceCurrentInstructionWithConstFalse(com.android.tools.r8.ir.code.IRCode):129:129 -> c
+    1:1:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):199:199 -> b
+    2:2:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):229:229 -> b
+    1:1:void replaceCurrentInstructionWithConstFalse(com.android.tools.r8.ir.code.IRCode):125:125 -> c
     void removeOrReplaceByDebugLocalRead() -> e
     void unsetInsertionPosition() -> h
-    1:1:void removeInstructionIgnoreOutValue():69:69 -> i
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.rr:
+    1:1:void removeInstructionIgnoreOutValue():68:68 -> i
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.wr:
     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.BasicBlock getBlock() -> j
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.Zu:
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.fv:
     boolean $assertionsDisabled -> n
     int[] keys -> m
     1:1:void <clinit>():28:28 -> <clinit>
@@ -50245,7 +50381,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222 -> u2
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getKeyToTargetMap():222:222 -> u2
     1:1:int[] getKeys():216:216 -> v2
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.Xv:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.dw:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():46:46 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):233:233 -> <init>
@@ -50270,16 +50406,16 @@
     43:43:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():280:280 -> a
     43:43:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):325 -> a
     44:53:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):325:334 -> a
-    54:54:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> a
+    54:54:int com.android.tools.r8.ir.code.Value.requiredRegisters():264:264 -> a
     54:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):335 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> a
+    55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():264:264 -> a
     55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):335 -> a
     56:58:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):336:338 -> a
-    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> a
+    59:59:int com.android.tools.r8.ir.code.Value.requiredRegisters():264:264 -> a
     59:59:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):338 -> a
     60:60:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):338:338 -> a
-    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> a
+    61:61:int com.android.tools.r8.ir.code.Value.requiredRegisters():264:264 -> a
     61:61:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):339 -> a
     62:63:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):340:341 -> a
     64:77:void addInvokeAndMoveResult(com.android.tools.r8.dex.code.DexInstruction,com.android.tools.r8.ir.conversion.DexBuilder):359:372 -> a
@@ -50305,10 +50441,10 @@
     1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():280:280 -> c
     1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):348 -> c
     2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):348:349 -> c
-    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> c
+    4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():264:264 -> c
     4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):349 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> c
+    5:5:int com.android.tools.r8.ir.code.Value.requiredRegisters():264:264 -> c
     5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):349 -> c
     6:6:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():280:280 -> c
     6:6:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):350 -> c
@@ -50316,10 +50452,10 @@
     8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():280:280 -> c
     8:8:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):351 -> c
     9:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):351:352 -> c
-    11:11:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> c
+    11:11:int com.android.tools.r8.ir.code.Value.requiredRegisters():264:264 -> c
     11:11:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):353 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:12:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> c
+    12:12:int com.android.tools.r8.ir.code.Value.requiredRegisters():264:264 -> c
     12:12:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):353 -> c
     13:13:com.android.tools.r8.ir.code.Value getArgument(int):284:284 -> c
     14:14:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():280:280 -> c
@@ -50392,12 +50528,12 @@
     1:1:boolean hasArguments():272 -> t2
     2:2:boolean hasArguments():272:272 -> t2
     1:1:int requiredArgumentRegisters():303:303 -> u2
-    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> u2
+    2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():264:264 -> u2
     2:2:int requiredArgumentRegisters():304 -> u2
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:int com.android.tools.r8.ir.code.Value.requiredRegisters():263:263 -> u2
+    3:3:int com.android.tools.r8.ir.code.Value.requiredRegisters():264:264 -> u2
     3:3:int requiredArgumentRegisters():304 -> u2
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.Wv:
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.cw:
     com.android.tools.r8.ir.code.Invoke$Type STATIC -> f
     com.android.tools.r8.ir.code.Invoke$Type SUPER -> g
     com.android.tools.r8.ir.code.Invoke$Type VIRTUAL -> h
@@ -50418,7 +50554,7 @@
     49:50:int getDexOpcode():180:181 -> a
     1:2:int getDexOpcodeRange():185:186 -> b
     1:1:boolean isVirtual():206:206 -> c
-com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.Yv:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.ew:
     com.android.tools.r8.graph.DexCallSite callSite -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():28:28 -> <clinit>
@@ -50467,7 +50603,7 @@
     1:1:java.lang.String getTypeString():118:118 -> s2
     1:1:java.lang.String toString():123:123 -> toString
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():108:108 -> v2
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.bw:
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.hw:
     boolean isInterface -> m
     boolean $assertionsDisabled -> n
     int $r8$clinit -> o
@@ -50497,7 +50633,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():71:71 -> r2
     1:1:java.lang.String getTypeString():76:76 -> s2
     1:1:boolean getInterfaceBit():61:61 -> v2
-com.android.tools.r8.ir.code.InvokeDirect$Builder -> com.android.tools.r8.internal.aw:
+com.android.tools.r8.ir.code.InvokeDirect$Builder -> com.android.tools.r8.internal.gw:
     1:1:void <init>():218:218 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:3:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):291:293 -> a
@@ -50508,7 +50644,7 @@
     2:2: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):39:39 -> b
     2:2:com.android.tools.r8.ir.code.InvokeDirect build():222 -> b
     3:3:com.android.tools.r8.ir.code.InvokeDirect build():222:222 -> b
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.ew:
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.kw:
     boolean $assertionsDisabled -> m
     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>
@@ -50530,7 +50666,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> r2
     1:1:java.lang.String getTypeString():57:57 -> s2
     boolean getInterfaceBit() -> v2
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.gw:
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.mw:
     com.android.tools.r8.graph.DexMethod method -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():44:44 -> <clinit>
@@ -50581,7 +50717,7 @@
     7:7:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):137:137 -> g
     8:8: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):161:161 -> g
     8:8:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):137 -> g
-    9:9:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> g
+    9:9:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> g
     9:9: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):161 -> g
     9:9:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):137 -> g
     10:10: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):161:161 -> g
@@ -50590,7 +50726,7 @@
     11:11:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):137 -> g
     12:12:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):136:136 -> g
     13:18:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):135:140 -> g
-    19:19:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.code.Value.getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1154:1154 -> g
+    19:19:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.code.Value.getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1155:1155 -> g
     19:19:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):140 -> g
     20:37:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):143:160 -> g
     38:46:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):158:166 -> g
@@ -50600,13 +50736,13 @@
     1:1:java.lang.String toString():102:102 -> toString
     boolean getInterfaceBit() -> v2
     1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():92:92 -> w2
-com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.fw:
+com.android.tools.r8.ir.code.InvokeMethod$Builder -> com.android.tools.r8.internal.lw:
     java.util.List arguments -> d
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod method -> c
     1:1:void <clinit>():284:284 -> <clinit>
     1:5:void <init>():284:288 -> <init>
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.hw:
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.nw:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):35:35 -> <init>
@@ -50617,11 +50753,11 @@
     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):64:64 -> a
     2:2:boolean throwsNpeIfValueIsNull(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):88:88 -> a
     3:10:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):103:110 -> a
-    11:11:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.code.Value.getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1154:1154 -> a
+    11:11:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.code.Value.getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1155:1155 -> a
     11:11:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):112 -> a
     12:12: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):161:161 -> a
     12:12:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):115 -> a
-    13:13:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    13:13:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> a
     13:13: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):161 -> a
     13:13:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):115 -> a
     14:14: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):161:161 -> a
@@ -50640,44 +50776,38 @@
     74:74:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):188 -> a
     75:75:boolean com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection.isCallToSideEffectFreeFinalMethod(com.android.tools.r8.ir.code.InvokeMethod):119:119 -> 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):188 -> a
-    76:102:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):192:218 -> a
-    103:103:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
-    103:103:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):219 -> a
-    104:104:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):220:220 -> a
-    105:105:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):770:770 -> a
-    105:105:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):220 -> a
+    76:103:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):192:219 -> a
+    104:104:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    104:104:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):219 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    106:106:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):770:770 -> a
-    106:106:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):220 -> a
-    107:107:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):221:221 -> a
-    108:108:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):774:774 -> a
-    108:108:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):221 -> a
-    109:109:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):770:770 -> a
-    109:109:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):774 -> a
-    109:109:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):221 -> 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):227:227 -> a
-    111:111:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
-    111:111:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):232 -> a
-    112:113:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):234:235 -> a
-    114:114:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
-    114:114:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):240 -> a
-    115:115:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):241:241 -> a
-    116:116:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):774:774 -> a
-    116:116:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):241 -> a
-    117:117:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):770:770 -> a
-    117:117:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):774 -> a
-    117:117:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):241 -> a
-    118:119:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):246:247 -> a
-    120:120:boolean com.android.tools.r8.ir.code.Instruction$SideEffectAssumption.canIgnoreInstanceFieldAssignmentsToReceiver():0:0 -> a
-    120:120:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):248 -> a
-    121:130:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):249:258 -> a
-    1:1:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> h
+    105:105:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    105:105:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):219 -> a
+    106:106:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):220:220 -> a
+    107:107:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):53:53 -> a
+    107:107:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):220 -> a
+    108:108:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    108:108:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):53 -> a
+    108:108:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):220 -> a
+    109:109:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):225:225 -> a
+    110:110:boolean com.android.tools.r8.graph.Definition.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):230 -> a
+    111:117:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):232:238 -> a
+    118:118:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):53:53 -> a
+    118:118:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):238 -> a
+    119:119:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    119:119:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):53 -> a
+    119:119:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):238 -> a
+    120:121:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):242:243 -> a
+    122:122:boolean com.android.tools.r8.ir.code.Instruction$SideEffectAssumption.canIgnoreInstanceFieldAssignmentsToReceiver():0:0 -> a
+    122:122:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):244 -> a
+    123:132:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):245:254 -> a
+    1:1:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> h
     1:1:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):71 -> h
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> h
+    2:2:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> h
     2:2:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):71 -> h
     3:3:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):72:72 -> h
-    4:4:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> h
+    4:4:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> h
     4:4:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):72 -> h
     5:6:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):73:74 -> h
     boolean throwsOnNullInput() -> n2
@@ -50685,7 +50815,7 @@
     1:1:java.lang.Iterable getNonReceiverArguments():39 -> x2
     2:2:java.lang.Iterable getNonReceiverArguments():39:39 -> x2
     1:2:com.android.tools.r8.ir.code.Value getReceiver():53:54 -> y2
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.iw:
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.ow:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():25:25 -> <clinit>
@@ -50719,7 +50849,7 @@
     1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():280:280 -> w2
     1:1:boolean instructionInstanceCanThrowNegativeArraySizeException():164 -> w2
     2:8:boolean instructionInstanceCanThrowNegativeArraySizeException():164:170 -> w2
-com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.jw:
+com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.pw:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():29:29 -> <clinit>
@@ -50755,7 +50885,7 @@
     1:1:java.lang.String getTypeString():64:64 -> s2
     1:1:java.lang.String toString():69:69 -> toString
     1:1:com.android.tools.r8.graph.DexType getArrayType():54:54 -> v2
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.kw:
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.qw:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexProto proto -> l
     1:1:void <clinit>():31:31 -> <clinit>
@@ -50797,7 +50927,7 @@
     1:1:java.lang.String getTypeString():67:67 -> s2
     boolean getInterfaceBit() -> v2
     1:1:com.android.tools.r8.graph.DexProto getProto():71:71 -> x2
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.pw:
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.vw:
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
     boolean isInterface -> l
@@ -50818,10 +50948,10 @@
     41:41:boolean com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection.isCallToSideEffectFreeFinalMethod(com.android.tools.r8.ir.code.InvokeMethod):119:119 -> a
     41:41:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):190 -> a
     42:70:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):195:223 -> a
-    71:71:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):774:774 -> a
+    71:71:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):53:53 -> a
     71:71:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):223 -> a
-    72:72:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):770:770 -> a
-    72:72:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):774 -> a
+    72:72:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    72:72:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):53 -> a
     72:72:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):223 -> a
     73:83:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):227:237 -> a
     84:84:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):214:214 -> a
@@ -50843,7 +50973,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():69:69 -> r2
     1:1:java.lang.String getTypeString():74:74 -> s2
     1:1:boolean getInterfaceBit():54:54 -> v2
-com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.ow:
+com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.uw:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():240:240 -> <clinit>
     1:1:void <init>():240:240 -> <init>
@@ -50860,7 +50990,7 @@
     8:9:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexMethod):306:307 -> a
     8:9:com.android.tools.r8.ir.code.InvokeMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):240 -> a
     1:5:com.android.tools.r8.ir.code.InvokeStatic build():244:248 -> b
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.qw:
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.ww:
     boolean isInterface -> m
     boolean $assertionsDisabled -> n
     1:1:void <clinit>():27:27 -> <clinit>
@@ -50884,7 +51014,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():53:53 -> r2
     1:1:java.lang.String getTypeString():58:58 -> s2
     1:1:boolean getInterfaceBit():38:38 -> v2
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.tw:
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.zw:
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
     1:1:void <clinit>():30:30 -> <clinit>
@@ -50893,7 +51023,7 @@
     1:20:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):68:87 -> 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.DynamicType):108:108 -> a
     22:37: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.DynamicType,com.android.tools.r8.graph.DexMethod):117:132 -> a
-    38:38:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> a
+    38:38:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> a
     38:38: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.DynamicType,com.android.tools.r8.graph.DexMethod):134 -> a
     39: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.DynamicType,com.android.tools.r8.graph.DexMethod):134:140 -> a
     46:46:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):146:146 -> a
@@ -50908,7 +51038,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():57:57 -> r2
     1:1:java.lang.String getTypeString():62:62 -> s2
     boolean getInterfaceBit() -> v2
-com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.sw:
+com.android.tools.r8.ir.code.InvokeVirtual$Builder -> com.android.tools.r8.internal.yw:
     1:1:void <init>():166:166 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:3:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setArguments(java.util.List):291:293 -> a
@@ -50916,7 +51046,7 @@
     4:5:com.android.tools.r8.ir.code.InvokeMethod$Builder com.android.tools.r8.ir.code.InvokeMethod$Builder.setMethod(com.android.tools.r8.graph.DexMethod):306:307 -> a
     4:5:com.android.tools.r8.ir.code.InvokeMethod$Builder setMethod(com.android.tools.r8.graph.DexMethod):166 -> a
     1:1:com.android.tools.r8.ir.code.InvokeVirtual build():170:170 -> b
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.Ax:
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.Gx:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -50931,67 +51061,67 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.JumpInstruction asJumpInstruction() -> f0
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> o2
-com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.IC:
+com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.OC:
     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.GD:
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.ND:
     java.util.Set seenBlocks -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.ir.code.IRCode code -> b
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> d
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> c
-    1:1:void <clinit>():22:22 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):31:31 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):34:34 -> <init>
-    3:18:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):28:43 -> <init>
-    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):57:57 -> a
-    2:2:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):63:63 -> a
-    3:3:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):68:68 -> a
-    4:4:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):78:78 -> a
-    5:5:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):85:85 -> a
-    6:6:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):94:94 -> a
-    7:7: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):101:101 -> a
-    8:8:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):106:106 -> a
-    9:9:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):117:117 -> a
-    10:10:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):123:123 -> a
-    11:11: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):135:135 -> a
-    12:12:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):146:146 -> a
-    13:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):153:153 -> a
-    14:14:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):158:158 -> a
-    15:15:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):164:164 -> a
-    16:16: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.DexProgramClass):175:175 -> a
-    17:17: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):190:190 -> a
-    18:21:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):200:203 -> a
-    22:32:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):236:246 -> a
-    1:1:void add(java.lang.Object):22:22 -> add
-    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):181:181 -> add
-    2:2:void add(java.lang.Object):22 -> add
-    1:1:boolean hasVisitedBlock(com.android.tools.r8.ir.code.BasicBlock):48:48 -> b
-    2:2:void replaceCurrentInstructionWithConstString(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):112:112 -> b
-    1:1:void removeOrReplaceByDebugLocalRead():196:196 -> e
-    1:1:boolean hasNext():208:208 -> hasNext
-    1:4:boolean hasPrevious():251:254 -> hasPrevious
-    1:1:java.util.Set getSeenBlocks():52:52 -> j
-    1:9:com.android.tools.r8.ir.code.Instruction next():213:221 -> k
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):30:30 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):33:33 -> <init>
+    3:18:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):27:42 -> <init>
+    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):56:56 -> a
+    2:2:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):62:62 -> a
+    3:3:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):67:67 -> a
+    4:4:com.android.tools.r8.ir.code.InvokeMethod insertNullCheckInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):77:77 -> a
+    5:5:boolean replaceCurrentInstructionByNullCheckIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):84:84 -> a
+    6:6:boolean removeOrReplaceCurrentInstructionByInitClassIfPossible(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,java.util.function.Consumer):90:90 -> a
+    7:7: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):97:97 -> a
+    8:8:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):102:102 -> a
+    9:9:void replaceCurrentInstructionWithNullCheck(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):113:113 -> a
+    10:10:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):119:119 -> a
+    11:11: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):131:131 -> a
+    12:12:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):142:142 -> a
+    13:13:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):149:149 -> a
+    14:14:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):154:154 -> a
+    15:15:com.android.tools.r8.ir.code.BasicBlock splitCopyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.utils.InternalOptions):160:160 -> a
+    16:16: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.DexProgramClass):171:171 -> a
+    17:17: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):186:186 -> a
+    18:21:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):196:199 -> a
+    22:32:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):232:242 -> 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):177:177 -> 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):108:108 -> b
+    1:1:void removeOrReplaceByDebugLocalRead():192:192 -> e
+    1:1:boolean hasNext():204:204 -> hasNext
+    1:4:boolean hasPrevious():247:250 -> hasPrevious
+    1:1:java.util.Set getSeenBlocks():51:51 -> j
+    1:9:com.android.tools.r8.ir.code.Instruction next():209:217 -> k
     10:10:com.android.tools.r8.ir.code.Instruction next():0:0 -> k
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":243,"2":244,"3":245}}
-    243:243:com.android.tools.r8.ir.code.Instruction next():222:222 -> k
-    244:244:com.android.tools.r8.ir.code.Instruction next():222:222 -> k
-    245:245:com.android.tools.r8.ir.code.Instruction next():222:222 -> k
-    233:242:com.android.tools.r8.ir.code.Instruction next():223:232 -> k
-    1:1:java.lang.Object next():22:22 -> next
-    1:1:int nextIndex():277:277 -> nextIndex
-    1:1:java.lang.Object previous():22:22 -> previous
-    2:15:com.android.tools.r8.ir.code.Instruction previous():259:272 -> previous
-    1:1:int previousIndex():282:282 -> previousIndex
-    1:1:void remove():287:287 -> remove
-    1:1:void set(java.lang.Object):22:22 -> set
-    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):292:292 -> set
-    2:2:void set(java.lang.Object):22 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.cE:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":239,"2":240,"3":241}}
+    239:239:com.android.tools.r8.ir.code.Instruction next():218:218 -> k
+    240:240:com.android.tools.r8.ir.code.Instruction next():218:218 -> k
+    241:241:com.android.tools.r8.ir.code.Instruction next():218:218 -> k
+    229:238:com.android.tools.r8.ir.code.Instruction next():219:228 -> k
+    1:1:java.lang.Object next():21:21 -> next
+    1:1:int nextIndex():273:273 -> nextIndex
+    1:1:java.lang.Object previous():21:21 -> previous
+    2:15:com.android.tools.r8.ir.code.Instruction previous():255:268 -> previous
+    1:1:int previousIndex():278:278 -> previousIndex
+    1:1:void remove():283:283 -> 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):288:288 -> set
+    2:2:void set(java.lang.Object):21 -> set
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.jE:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):23:23 -> <init>
     boolean hasInvariantOutType() -> X0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -51011,7 +51141,7 @@
     1:1:int maxOutValueRegister():62:62 -> k2
     int opcode() -> l2
     1:1:com.android.tools.r8.ir.code.Value src():37:37 -> o2
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.pE:
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.wE:
     boolean $assertionsDisabled -> j
     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>
@@ -51056,10 +51186,10 @@
     1:5:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):44:48 -> d
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> h0
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> t2
-com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.oE:
+com.android.tools.r8.ir.code.LogicalBinop$1 -> com.android.tools.r8.internal.vE:
     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.SF:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.ZF:
     com.android.tools.r8.ir.code.MemberType BOOLEAN_OR_BYTE -> c
     com.android.tools.r8.ir.code.MemberType OBJECT -> b
     com.android.tools.r8.ir.code.MemberType SHORT -> e
@@ -51075,23 +51205,8 @@
     11:11:void <clinit>() -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
     1:1:boolean isPrecise():24:24 -> a
-    2:2:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):104:104 -> a
-    3:3:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.fromTypeDescriptorChar(char):99:99 -> a
-    3:3:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):104 -> a
-    4:4:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.fromTypeDescriptorChar(char):97:97 -> a
-    4:4:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):104 -> a
-    5:5:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.fromTypeDescriptorChar(char):85:85 -> a
-    5:5:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):104 -> a
-    6:19:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.fromTypeDescriptorChar(char):80:93 -> a
-    6:19:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):104 -> a
-    20:26:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.fromTypeDescriptorChar(char):89:95 -> a
-    20:26:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):104 -> a
-    27:27:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.fromTypeDescriptorChar(char):87:87 -> a
-    27:27:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):104 -> a
-    28:28:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.fromTypeDescriptorChar(char):83:83 -> a
-    28:28:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):104 -> 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.tH:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.AH:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.Monitor$Type type -> i
     1:1:void <clinit>():21:21 -> <clinit>
@@ -51127,10 +51242,10 @@
     int opcode() -> l2
     boolean throwsOnNullInput() -> n2
     1:1:boolean isEnter():49:49 -> o2
-com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.rH:
+com.android.tools.r8.ir.code.Monitor$1 -> com.android.tools.r8.internal.yH:
     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.sH:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.zH:
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> d
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> b
     com.android.tools.r8.ir.code.Monitor$Type EXIT -> c
@@ -51138,7 +51253,7 @@
     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.uH:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.BH:
     boolean $assertionsDisabled -> i
     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>
@@ -51167,7 +51282,7 @@
     1:1:com.android.tools.r8.ir.code.Value dest():38:38 -> o2
     1:1:com.android.tools.r8.ir.code.Value src():42:42 -> p2
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.wH:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.DH:
     com.android.tools.r8.graph.DexType exceptionType -> i
     boolean $assertionsDisabled -> k
     com.android.tools.r8.utils.InternalOptions options -> j
@@ -51202,7 +51317,7 @@
     int maxOutValueRegister() -> k2
     int opcode() -> l2
     1:1:com.android.tools.r8.graph.DexType getExceptionType():127:127 -> o2
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.yH:
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.FH:
     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):23:23 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -51227,7 +51342,7 @@
     int opcode() -> l2
     boolean isCommutative() -> p2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():142:142 -> t2
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.pI:
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.wI:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():22:22 -> <clinit>
@@ -51257,10 +51372,10 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):50:50 -> b
     int opcode() -> l2
     com.android.tools.r8.ir.code.Neg asNeg() -> m0
-com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.oI:
+com.android.tools.r8.ir.code.Neg$1 -> com.android.tools.r8.internal.vI:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():58:58 -> <clinit>
-com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.zI:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.GI:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -51299,7 +51414,7 @@
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> n0
     1:1:com.android.tools.r8.ir.code.Value size():55:55 -> o2
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.AI:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.HI:
     long size -> j
     short[] data -> k
     int element_width -> i
@@ -51340,7 +51455,7 @@
     int opcode() -> l2
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> o0
     1:1:com.android.tools.r8.ir.code.Value src():50:50 -> o2
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.CI:
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.JI:
     int $r8$clinit -> l
     com.android.tools.r8.graph.DexType clazz -> i
     boolean allowSpilling -> j
@@ -51378,13 +51493,13 @@
     1:1:boolean isSpillingAllowed():215:215 -> q2
     1:1:void markNoSpilling():211:211 -> r2
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.ir.code.NewInstance$Builder -> com.android.tools.r8.internal.BI:
+com.android.tools.r8.ir.code.NewInstance$Builder -> com.android.tools.r8.internal.II:
     com.android.tools.r8.graph.DexType type -> c
     1:1:void <init>():240:240 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.NewInstance$Builder setType(com.android.tools.r8.graph.DexType):245:245 -> a
     1:1:com.android.tools.r8.ir.code.NewInstance build():251:251 -> b
-com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.DI:
+com.android.tools.r8.ir.code.NewUnboxedEnumInstance -> com.android.tools.r8.internal.KI:
     com.android.tools.r8.graph.DexType clazz -> i
     int ordinal -> j
     boolean $assertionsDisabled -> k
@@ -51412,9 +51527,9 @@
     1:1:int getOrdinal():55:55 -> o2
     com.android.tools.r8.ir.code.NewUnboxedEnumInstance asNewUnboxedEnumInstance() -> q0
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.EI:
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.LI:
     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.DJ:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.KJ:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():20:20 -> <clinit>
@@ -51443,10 +51558,10 @@
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):84:84 -> b
     int opcode() -> l2
     com.android.tools.r8.ir.code.Not asNot() -> r0
-com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.CJ:
+com.android.tools.r8.ir.code.Not$1 -> com.android.tools.r8.internal.JJ:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():69:69 -> <clinit>
-com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.UJ:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.bK:
     com.android.tools.r8.ir.code.NumericType to -> j
     com.android.tools.r8.ir.code.NumericType from -> i
     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):37:39 -> <init>
@@ -51506,15 +51621,15 @@
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):139:143 -> b
     int opcode() -> l2
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> s0
-com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.TJ:
+com.android.tools.r8.ir.code.NumberConversion$1 -> com.android.tools.r8.internal.aK:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():63:63 -> <clinit>
-com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.YJ:
+com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.fK:
     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.dK:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.kK:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> h
     com.android.tools.r8.ir.code.NumericType FLOAT -> g
     com.android.tools.r8.ir.code.NumericType LONG -> f
@@ -51541,10 +51656,10 @@
     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.cK:
+com.android.tools.r8.ir.code.NumericType$1 -> com.android.tools.r8.internal.jK:
     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.WM:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.nN:
     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>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -51564,7 +51679,7 @@
     boolean isCommutative() -> p2
     com.android.tools.r8.ir.code.Or asOr() -> t0
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():94:94 -> t2
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.SN:
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.kO:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
     java.util.List operands -> s
@@ -51665,7 +51780,7 @@
     174:181:void print(com.android.tools.r8.utils.CfgPrinter):341:348 -> a
     182:182:void addDefinitionsUser(java.util.Map):353:353 -> a
     183:183:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402:402 -> a
-    184:184:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():790:790 -> a
+    184:184:com.android.tools.r8.ir.code.ValueType com.android.tools.r8.ir.code.Value.outType():791:791 -> a
     184:184:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):402 -> a
     185:193: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
@@ -51694,18 +51809,18 @@
     6:6:void removeDeadPhi():324:324 -> l0
     1:1:boolean removeTrivialPhi():240:240 -> m0
     1:1:void setIsStackPhi(boolean):376:376 -> n0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.SN$a:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.kO$a:
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> b
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> c
     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.TN:
+com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.lO:
     boolean $assertionsDisabled -> x
     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 -> c
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.dO:
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.vO:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value):20:21 -> <init>
@@ -51730,7 +51845,7 @@
     1:1:int maxOutValueRegister():78:78 -> k2
     int opcode() -> l2
     com.android.tools.r8.ir.code.Pop asPop() -> u0
-com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.iO:
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.AO:
     boolean removeInnerFramesIfThrowingNpe -> e
     boolean $assertionsDisabled -> f
     int line -> b
@@ -51781,7 +51896,7 @@
     1:19:java.lang.String com.android.tools.r8.ir.code.Position.toString(boolean):205:223 -> toString
     1:19:java.lang.String toString():228 -> toString
     1:1:com.android.tools.r8.ir.code.Position syntheticNone():117:117 -> u
-com.android.tools.r8.ir.code.Position$OutlineCallerPosition -> com.android.tools.r8.internal.fO:
+com.android.tools.r8.ir.code.Position$OutlineCallerPosition -> com.android.tools.r8.internal.xO:
     boolean isOutline -> i
     com.android.tools.r8.graph.DexMethod outlineCallee -> h
     com.android.tools.r8.utils.Int2StructuralItemArrayMap outlinePositions -> g
@@ -51801,7 +51916,7 @@
     boolean isNone() -> n
     1:1:boolean isOutline():537:537 -> o
     1:1:com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder builder():556:556 -> v
-com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder -> com.android.tools.r8.internal.eO:
+com.android.tools.r8.ir.code.Position$OutlineCallerPosition$OutlineCallerPositionBuilder -> com.android.tools.r8.internal.wO:
     boolean isOutline -> i
     boolean $assertionsDisabled -> j
     com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder outlinePositionsBuilder -> g
@@ -51817,7 +51932,7 @@
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> d
     1:8:com.android.tools.r8.ir.code.Position$OutlineCallerPosition build():595:602 -> e
     1:1:boolean hasOutlinePositions():590:590 -> f
-com.android.tools.r8.ir.code.Position$OutlinePosition -> com.android.tools.r8.internal.hO:
+com.android.tools.r8.ir.code.Position$OutlinePosition -> com.android.tools.r8.internal.zO:
     1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.ir.code.Position$1):429:429 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean):436:436 -> <init>
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
@@ -51831,13 +51946,13 @@
     1:1:void lambda$getStructuralMapping$0(com.android.tools.r8.utils.structural.StructuralSpecification):460:460 -> c
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():460:460 -> m
     1:1:com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder builder():464:464 -> v
-com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder -> com.android.tools.r8.internal.gO:
+com.android.tools.r8.ir.code.Position$OutlinePosition$OutlinePositionBuilder -> com.android.tools.r8.internal.yO:
     1:1:void <init>(com.android.tools.r8.ir.code.Position$1):467:467 -> <init>
     2:2:void <init>():470:470 -> <init>
     1:1:com.android.tools.r8.ir.code.Position build():467:467 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> d
     1:1:com.android.tools.r8.ir.code.Position$OutlinePosition build():479:479 -> e
-com.android.tools.r8.ir.code.Position$PositionBuilder -> com.android.tools.r8.internal.iO$a:
+com.android.tools.r8.ir.code.Position$PositionBuilder -> com.android.tools.r8.internal.AO$a:
     boolean noCheckOfPosition -> e
     boolean noCheckOfMethod -> f
     com.android.tools.r8.graph.DexMethod method -> b
@@ -51853,7 +51968,7 @@
     1:2:com.android.tools.r8.ir.code.Position$PositionBuilder disableLineCheck():271:272 -> b
     1:2:com.android.tools.r8.ir.code.Position$PositionBuilder disableMethodCheck():276:277 -> c
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> d
-com.android.tools.r8.ir.code.Position$SourcePosition -> com.android.tools.r8.internal.iO$b:
+com.android.tools.r8.ir.code.Position$SourcePosition -> com.android.tools.r8.internal.AO$b:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexString file -> g
     com.android.tools.r8.ir.code.Position$SourcePosition NO_POSITION -> h
@@ -51875,7 +51990,7 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():334:334 -> m
     1:1:com.android.tools.r8.ir.code.Position$SourcePosition access$000():283:283 -> v
     1:1:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder builder():338:338 -> w
-com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder -> com.android.tools.r8.internal.iO$b$a:
+com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder -> com.android.tools.r8.internal.AO$b$a:
     com.android.tools.r8.graph.DexString file -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():341:341 -> <clinit>
@@ -51884,7 +51999,7 @@
     2:2:com.android.tools.r8.ir.code.Position$SourcePosition$SourcePositionBuilder setFile(com.android.tools.r8.graph.DexString):352:352 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> d
     1:3:com.android.tools.r8.ir.code.Position$SourcePosition build():358:360 -> e
-com.android.tools.r8.ir.code.Position$SyntheticPosition -> com.android.tools.r8.internal.iO$c:
+com.android.tools.r8.ir.code.Position$SyntheticPosition -> com.android.tools.r8.internal.AO$c:
     com.android.tools.r8.ir.code.Position NO_POSITION_SYNTHETIC -> g
     1:1:void <clinit>():371:371 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,boolean,com.android.tools.r8.ir.code.Position$1):366:366 -> <init>
@@ -51901,7 +52016,7 @@
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():403:403 -> m
     1:1:com.android.tools.r8.ir.code.Position access$100():366:366 -> v
     1:1:com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder builder():407:407 -> w
-com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder -> com.android.tools.r8.internal.iO$c$a:
+com.android.tools.r8.ir.code.Position$SyntheticPosition$SyntheticPositionBuilder -> com.android.tools.r8.internal.AO$c$a:
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():410:410 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Position$1):410:410 -> <init>
@@ -51909,9 +52024,9 @@
     1:1:com.android.tools.r8.ir.code.Position build():410:410 -> a
     com.android.tools.r8.ir.code.Position$PositionBuilder self() -> d
     1:3:com.android.tools.r8.ir.code.Position$SyntheticPosition build():422:424 -> e
-com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.internal.LO:
+com.android.tools.r8.ir.code.PreviousUntilIterator -> com.android.tools.r8.internal.dP:
     1:3:java.lang.Object previousUntil(java.util.function.Predicate):18:20 -> b
-com.android.tools.r8.ir.code.RecordFieldValues -> com.android.tools.r8.internal.CS:
+com.android.tools.r8.ir.code.RecordFieldValues -> com.android.tools.r8.internal.XS:
     com.android.tools.r8.graph.DexField[] fields -> i
     1:2:void <init>(com.android.tools.r8.graph.DexField[],com.android.tools.r8.ir.code.Value,java.util.List):28:29 -> <init>
     boolean hasInvariantOutType() -> X0
@@ -51941,7 +52056,7 @@
     int opcode() -> l2
     1:1:com.android.tools.r8.graph.DexField[] getFields():33:33 -> o2
     com.android.tools.r8.ir.code.RecordFieldValues asRecordFieldValues() -> v0
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.KU:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.fV:
     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):25:25 -> <init>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     double foldDouble(double,double) -> a
@@ -51971,7 +52086,7 @@
     boolean isCommutative() -> p2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():149:149 -> t2
     com.android.tools.r8.ir.code.Rem asRem() -> w0
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.XV:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.sW:
     boolean $assertionsDisabled -> j
     int $r8$clinit -> k
     1:1:void <clinit>():23:23 -> <clinit>
@@ -52025,21 +52140,21 @@
     1:1:boolean isReturnVoid():48:48 -> p2
     1:2:com.android.tools.r8.ir.code.Value returnValue():61:62 -> q2
     com.android.tools.r8.ir.code.Return asReturn() -> x0
-com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.WV:
+com.android.tools.r8.ir.code.Return$Builder -> com.android.tools.r8.internal.rW:
     1:1:void <init>():141:141 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
     1:1:com.android.tools.r8.ir.code.Return build():145:145 -> b
-com.android.tools.r8.ir.code.SafeCheckCast -> com.android.tools.r8.internal.qW:
+com.android.tools.r8.ir.code.SafeCheckCast -> com.android.tools.r8.internal.LW:
     int $r8$clinit -> m
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):18:18 -> <init>
     1:1:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):27:27 -> a
     boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> b
     1:1:com.android.tools.r8.dex.code.DexCheckCast createCheckCast(int):32:32 -> c
     com.android.tools.r8.ir.code.SafeCheckCast asSafeCheckCast() -> y0
-com.android.tools.r8.ir.code.SafeCheckCast$Builder -> com.android.tools.r8.internal.pW:
+com.android.tools.r8.ir.code.SafeCheckCast$Builder -> com.android.tools.r8.internal.KW:
     1:1:void <init>():50:50 -> <init>
     1:1:com.android.tools.r8.ir.code.CheckCast build():54:54 -> b
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.QW:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.lX:
     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>
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
     int foldIntegers(int,int) -> a
@@ -52060,7 +52175,7 @@
     boolean isCommutative() -> p2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():99:99 -> t2
     com.android.tools.r8.ir.code.Shl asShl() -> z0
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.TW:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.oX:
     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.Shr asShr() -> A0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -52081,9 +52196,9 @@
     int opcode() -> l2
     boolean isCommutative() -> p2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():99:99 -> t2
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.rX:
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.MX:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.yY:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.TY:
     int height -> r
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> s
     boolean $assertionsDisabled -> t
@@ -52101,7 +52216,7 @@
     62:62:java.lang.String toString():59:59 -> toString
     63:63:java.lang.String toString():59:59 -> toString
     60:60:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.zY:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.UY:
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():14:14 -> <clinit>
@@ -52112,7 +52227,7 @@
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> h0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> w
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.UY:
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.pZ:
     int $r8$clinit -> l
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():36:36 -> <clinit>
@@ -52141,44 +52256,51 @@
     209:223:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):78:92 -> a
     224:230:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):90:96 -> a
     231:231:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):153:153 -> a
-    232:232:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):178:178 -> a
-    233:233:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):213:213 -> a
-    234:234:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):218:218 -> a
+    232:232: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
+    233:233:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):222:222 -> a
+    234:234:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):227:227 -> a
     235:235:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.conversion.CfBuilder.resolveField(com.android.tools.r8.graph.DexField):239:239 -> a
-    235:235:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):218 -> a
+    235:235:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):227 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     236:237:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.conversion.CfBuilder.resolveField(com.android.tools.r8.graph.DexField):240:241 -> a
-    236:237:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):218 -> a
-    238:238:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):218:218 -> a
-    239:239:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):223:223 -> a
-    240:240:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):228:228 -> a
-    241:241: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):238:238 -> a
-    242:242:boolean outTypeKnownToBeBoolean(java.util.Set):244:244 -> a
+    236:237:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):227 -> a
+    238:238:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):227:227 -> a
+    239:239:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):232:232 -> a
+    240:240:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):237:237 -> a
+    241:241: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):247:247 -> a
+    242:242:boolean outTypeKnownToBeBoolean(java.util.Set):253:253 -> a
     243:243:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.StaticGet):319:319 -> a
     243:243:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):64 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):168:168 -> b
-    2:2:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
-    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):168 -> b
-    3:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):171:172 -> b
+    1:1:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):159:159 -> b
+    2:2:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> 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):159 -> b
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:3:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> 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):159 -> 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):162:162 -> b
+    5:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):177:177 -> b
+    6:6:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
+    6:6:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):177 -> b
+    7:8:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):180:181 -> b
     1:1:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):147:147 -> c
     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):153:153 -> c
     2:2:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):147 -> c
-    1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):249:257 -> d
+    1:9:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):258:266 -> d
     boolean instructionTypeCanBeCanonicalized() -> e1
     boolean instructionTypeCanThrow() -> f1
     int maxInValueRegister() -> j2
     int maxOutValueRegister() -> k2
     int opcode() -> l2
-    1:1:java.lang.String toString():183:183 -> toString
+    1:1:java.lang.String toString():192:192 -> toString
     1:1:com.android.tools.r8.ir.code.Value value():73:73 -> value
-com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.TY:
+com.android.tools.r8.ir.code.StaticGet$Builder -> com.android.tools.r8.internal.oZ:
     com.android.tools.r8.graph.DexField field -> c
-    1:1:void <init>():261:261 -> <init>
+    1:1:void <init>():270:270 -> <init>
     com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
-    1:1:com.android.tools.r8.ir.code.StaticGet$Builder setField(com.android.tools.r8.graph.DexField):270:270 -> a
-    1:1:com.android.tools.r8.ir.code.StaticGet build():276:276 -> b
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.WY:
+    1:1:com.android.tools.r8.ir.code.StaticGet$Builder setField(com.android.tools.r8.graph.DexField):279:279 -> a
+    1:1:com.android.tools.r8.ir.code.StaticGet build():285:285 -> b
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.rZ:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):38:38 -> <init>
@@ -52227,7 +52349,7 @@
     int opcode() -> l2
     1:1:java.lang.String toString():191:191 -> toString
     1:2:com.android.tools.r8.ir.code.Value value():58:59 -> value
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.XY:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.sZ:
     boolean $assertionsDisabled -> i
     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>
@@ -52251,7 +52373,7 @@
     int maxOutValueRegister() -> k2
     int opcode() -> l2
     1:1:com.android.tools.r8.ir.code.Value src():39:39 -> o2
-com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.vZ:
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.QZ:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.DexString[] keys -> m
     1:1:void <clinit>():17:17 -> <clinit>
@@ -52276,7 +52398,7 @@
     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.Sub -> com.android.tools.r8.internal.YZ:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.t00:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():25:25 -> <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):28:28 -> <init>
@@ -52319,7 +52441,7 @@
     7:9:int maxInOutValueRegisterSize():137 -> r2
     10:12:int maxInOutValueRegisterSize():137:139 -> r2
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():218:218 -> t2
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.h00:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.C00:
     boolean $assertionsDisabled -> i
     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>
@@ -52339,7 +52461,7 @@
     int maxInValueRegister() -> j2
     1:1:int maxOutValueRegister():85:85 -> k2
     int opcode() -> l2
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.i00:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.D00:
     int fallthroughBlockIndex -> k
     boolean $assertionsDisabled -> l
     int[] targetBlockIndices -> j
@@ -52365,7 +52487,7 @@
     4:4:boolean valid():29 -> s2
     5:5:boolean valid():29:29 -> s2
     1:1:com.android.tools.r8.ir.code.Value value():24:24 -> value
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.K00:
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.g10:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
@@ -52387,17 +52509,17 @@
     1:1:int maxOutValueRegister():50:50 -> k2
     int opcode() -> l2
     1:1:com.android.tools.r8.ir.code.Value exception():35:35 -> p2
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.L20:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.h30:
     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() -> k
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.K20:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.g30:
     com.android.tools.r8.ir.analysis.type.TypeElement val$type -> c
     com.android.tools.r8.graph.DebugLocalInfo val$local -> b
     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 -> k
-com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.p30:
+com.android.tools.r8.ir.code.UninitializedThisLocalRead -> com.android.tools.r8.internal.L30:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):29:29 -> <init>
     boolean hasInvariantOutType() -> X0
     void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper) -> a
@@ -52411,7 +52533,7 @@
     int maxInValueRegister() -> j2
     int maxOutValueRegister() -> k2
     int opcode() -> l2
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.E30:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.a40:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean hasInvariantOutType() -> X0
     1:2:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):56:57 -> a
@@ -52423,7 +52545,7 @@
     int maxInValueRegister() -> j2
     int maxOutValueRegister() -> k2
     1:1:com.android.tools.r8.ir.code.Value source():25:25 -> o2
-com.android.tools.r8.ir.code.UnusedArgument -> com.android.tools.r8.internal.M30:
+com.android.tools.r8.ir.code.UnusedArgument -> com.android.tools.r8.internal.i40:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):26:26 -> <init>
     boolean hasInvariantOutType() -> X0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -52439,7 +52561,7 @@
     1:1:int maxInValueRegister():97:97 -> j2
     1:1:int maxOutValueRegister():102:102 -> k2
     int opcode() -> l2
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.S30:
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.o40:
     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.Ushr asUshr() -> I0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -52460,7 +52582,7 @@
     int opcode() -> l2
     boolean isCommutative() -> p2
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():99:99 -> t2
-com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.a40:
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.w40:
     com.android.tools.r8.ir.regalloc.LiveIntervals liveIntervals -> j
     com.android.tools.r8.ir.analysis.type.TypeElement type -> o
     int needsRegister -> k
@@ -52477,243 +52599,243 @@
     java.util.LinkedList phiUsers -> f
     com.android.tools.r8.ir.code.Value$DebugData debugData -> n
     com.android.tools.r8.utils.LongInterval valueRange -> m
-    1:114:void <clinit>():53:166 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):183:183 -> <init>
-    2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):169:187 -> <init>
-    1:1:boolean hasLocalInfo():271:271 -> A
-    1:1:boolean hasNonDebugUsers():414:414 -> B
-    1:1:boolean hasPhiUsers():418:418 -> C
-    1:1:boolean hasUsers():422:422 -> D
-    1:1:boolean hasUsersInfo():554:554 -> F
-    1:1:boolean hasValueRange():948:948 -> G
-    1:1:boolean isArgument():874:874 -> H
-    1:1:boolean isConstClass():828:828 -> I
+    1:114:void <clinit>():54:167 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):184:184 -> <init>
+    2:20:void <init>(int,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):170:188 -> <init>
+    1:1:boolean hasLocalInfo():272:272 -> A
+    1:1:boolean hasNonDebugUsers():415:415 -> B
+    1:1:boolean hasPhiUsers():419:419 -> C
+    1:1:boolean hasUsers():423:423 -> D
+    1:1:boolean hasUsersInfo():555:555 -> F
+    1:1:boolean hasValueRange():949:949 -> G
+    1:1:boolean isArgument():875:875 -> H
+    1:1:boolean isConstClass():829:829 -> I
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> I
-    2:2:boolean isConstClass():828 -> I
-    1:1:boolean isConstNumber():799:799 -> J
-    1:1:boolean isConstString():812:812 -> K
+    2:2:boolean isConstClass():829 -> I
+    1:1:boolean isConstNumber():800:800 -> J
+    1:1:boolean isConstString():813:813 -> K
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> K
-    2:2:boolean isConstString():812 -> K
-    1:1:boolean isConstant():832:832 -> L
-    1:1:boolean isDexItemBasedConstString():816:816 -> M
+    2:2:boolean isConstString():813 -> K
+    1:1:boolean isConstant():833:833 -> L
+    1:1:boolean isDexItemBasedConstString():817:817 -> M
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> M
-    2:2:boolean isDexItemBasedConstString():816 -> M
+    2:2:boolean isDexItemBasedConstString():817 -> M
     boolean isFixedRegisterValue() -> N
-    1:1:boolean isLinked():314:314 -> O
-    1:3:boolean isNeverNull():868:870 -> P
-    1:1:boolean isThis():940:940 -> Q
-    1:1:boolean isUsed():463:463 -> R
-    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():455:455 -> R
-    2:2:boolean isUsed():463 -> R
+    1:1:boolean isLinked():315:315 -> O
+    1:3:boolean isNeverNull():869:871 -> P
+    1:1:boolean isThis():941:941 -> Q
+    1:1:boolean isUsed():464:464 -> R
+    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():456:456 -> R
+    2:2:boolean isUsed():464 -> R
     boolean isValueOnStack() -> S
-    1:3:boolean isZero():1042:1044 -> T
-    1:3:void markAsThis():929:931 -> U
-    1:1:void markNonDebugLocalRead():149:149 -> V
-    1:2:boolean needsRegister():706:707 -> W
-    3:10:boolean com.android.tools.r8.ir.code.Value.internalComputeNeedsRegister():722:729 -> W
-    3:10:boolean needsRegister():707 -> W
-    11:12:boolean needsRegister():707:708 -> W
-    1:1:int com.android.tools.r8.ir.code.Value.numberOfAllNonDebugUsers():451:451 -> X
-    1:1:int numberOfAllUsers():459 -> X
-    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():455:455 -> X
-    2:2:int numberOfAllUsers():459 -> X
-    1:5:int numberOfPhiUsers():443:447 -> Y
-    1:5:int numberOfUsers():435:439 -> Z
+    1:3:boolean isZero():1043:1045 -> T
+    1:3:void markAsThis():930:932 -> U
+    1:1:void markNonDebugLocalRead():150:150 -> V
+    1:2:boolean needsRegister():707:708 -> W
+    3:10:boolean com.android.tools.r8.ir.code.Value.internalComputeNeedsRegister():723:730 -> W
+    3:10:boolean needsRegister():708 -> W
+    11:12:boolean needsRegister():708:709 -> W
+    1:1:int com.android.tools.r8.ir.code.Value.numberOfAllNonDebugUsers():452:452 -> X
+    1:1:int numberOfAllUsers():460 -> X
+    2:2:int com.android.tools.r8.ir.code.Value.numberOfDebugUsers():456:456 -> X
+    2:2:int numberOfAllUsers():460 -> X
+    1:5:int numberOfPhiUsers():444:448 -> Y
+    1:5:int numberOfUsers():436:440 -> 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):57:70 -> a
-    15:15: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):59:59 -> 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):58:71 -> a
+    15:15: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):60:60 -> a
     16:16: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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":86,"2":87,"3":88}}
-    86:86: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):59:59 -> a
-    87:87: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):59:59 -> a
-    88:88: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):59:59 -> a
-    75:85: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):59:59 -> a
-    89:148:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):75:134 -> a
-    149:150:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):129:130 -> a
-    151:151:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):124:124 -> a
-    152:152:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isLong():0:0 -> a
-    152:152:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):124 -> a
-    153:153:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):125:125 -> a
-    154:154:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):119:119 -> a
-    155:155:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDouble():0:0 -> a
-    155:155:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):119 -> a
-    156:156:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):120:120 -> a
-    157:157:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):111:111 -> a
-    158:158:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
-    158:158:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):111 -> a
-    159:162:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):112:115 -> a
-    163:163:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):106:106 -> a
-    164:164:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
-    164:164:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):106 -> a
-    165:165:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):106:106 -> a
-    166:166:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    166:166:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):106 -> a
-    167:167:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):107:107 -> a
-    168:168:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):101:101 -> a
-    169:169:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
-    169:169:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):101 -> a
-    170:170:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):101:101 -> a
-    171:171:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> a
-    171:171:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):101 -> a
-    172:172:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):102:102 -> a
-    173:173:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):80:80 -> a
-    174:174:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
-    174:174:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):80 -> a
-    175:185:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):81:91 -> a
-    186:186:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
-    186:186:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):91 -> a
-    187:188:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):93:94 -> a
-    189:189:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> a
-    189:189:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):94 -> a
-    190:192:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):94:96 -> a
-    193:197:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):93:97 -> a
-    198:198:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):140:140 -> a
-    199:199:boolean com.android.tools.r8.ir.code.Value.verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):144:144 -> a
-    199:199:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):140 -> a
-    200:220:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):228:248 -> a
-    221:221:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    221:221:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):248 -> a
-    222:222:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):248:248 -> a
-    223:224:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):254:255 -> a
-    225:227:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):275:277 -> a
-    228:230:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):287:289 -> a
-    231:235:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):334:338 -> a
-    236:238:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):366:368 -> a
-    239:246:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):377:384 -> a
-    247:247:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):383:383 -> a
-    248:249:void addPhiUser(com.android.tools.r8.ir.code.Phi):523:524 -> a
-    250:252:java.util.Set affectedValues():569:571 -> a
-    253:253:void addAffectedValuesTo(java.util.Set):575:575 -> a
-    254:259:void forEachAffectedValue(java.util.function.Consumer):579:584 -> a
-    260:273:void replaceUsers(com.android.tools.r8.ir.code.Value,java.util.Set):595:608 -> a
-    274:274:void com.android.tools.r8.ir.code.Value.replaceUserInDebugData(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):682:682 -> a
-    274:274:void replaceUsers(com.android.tools.r8.ir.code.Value,java.util.Set):609 -> a
-    275:277:void replaceUsers(com.android.tools.r8.ir.code.Value,java.util.Set):611:613 -> a
-    278:281:void replaceSelectiveInstructionUsers(com.android.tools.r8.ir.code.Value,java.util.function.Predicate):630:633 -> a
-    282:307:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):648:673 -> a
-    308:308:void com.android.tools.r8.ir.code.Value.replaceUserInDebugData(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):682:682 -> a
-    308:308:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):674 -> a
-    309:309:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):675:675 -> a
-    310:311:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):697:698 -> a
-    312:313:void setNeedsRegister(boolean):712:713 -> a
-    314:314:int compareTo(com.android.tools.r8.ir.code.Value):751:751 -> a
-    315:328:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):836:849 -> a
-    329:329:void setValueRange(com.android.tools.r8.utils.LongInterval):944:944 -> a
-    330:330:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):976:976 -> a
-    331:331: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):981:981 -> a
-    331:331:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):976 -> a
-    332:345:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):998:1011 -> a
-    346:346:boolean com.android.tools.r8.com.google.common.base.Predicate.test(java.lang.Object):79:79 -> a
-    346:346:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1011 -> a
-    347:367:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1014:1034 -> a
-    368:369:void setType(com.android.tools.r8.ir.analysis.type.TypeElement):1053:1054 -> a
-    370:370:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1073:1073 -> a
-    371:372:boolean com.android.tools.r8.ir.code.Value.skipWideningOrNarrowingCheck(com.android.tools.r8.graph.AppView):1085:1086 -> a
-    371:372:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1073 -> a
-    373:373:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1073:1073 -> a
-    374:374:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1455,"2":1456,"3":1457}}
-    1455:1455:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1073:1073 -> a
-    1456:1456:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1073:1073 -> a
-    1457:1457:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1073:1073 -> a
-    1447:1454:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1073:1080 -> a
-    1458:1503:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1103:1148 -> a
-    1504:1508:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1165:1169 -> a
-    1509:1509:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.meetNullability(com.android.tools.r8.ir.analysis.type.Nullability):153:153 -> a
-    1509:1509:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1170 -> a
-    1510:1538:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1174:1202 -> a
-    1539:1539:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.meetNullability(com.android.tools.r8.ir.analysis.type.Nullability):153:153 -> a
-    1539:1539:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1202 -> a
-    1540:1540:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1203:1203 -> a
-    1541:1541:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):83:83 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":87,"2":88,"3":89}}
+    87:87: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):60:60 -> a
+    88:88: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):60:60 -> a
+    89:89: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):60:60 -> a
+    76:86: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):60:60 -> a
+    90:149:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):76:135 -> a
+    150:151:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):130:131 -> a
+    152:152:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):125:125 -> a
+    153:153:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isLong():0:0 -> a
+    153:153:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):125 -> a
+    154:154:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):126:126 -> a
+    155:155:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):120:120 -> a
+    156:156:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDouble():0:0 -> a
+    156:156:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):120 -> a
+    157:157:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):121:121 -> a
+    158:158:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):112:112 -> a
+    159:159:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
+    159:159:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):112 -> a
+    160:163:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):113:116 -> a
+    164:164:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):107:107 -> a
+    165:165:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
+    165:165:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):107 -> a
+    166:166:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):107:107 -> a
+    167:167:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
+    167:167:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):107 -> a
+    168:168:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):108:108 -> a
+    169:169:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):102:102 -> a
+    170:170:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
+    170:170:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):102 -> a
+    171:171:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):102:102 -> a
+    172:172:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> a
+    172:172:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):102 -> a
+    173:173:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):103:103 -> a
+    174:174:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):81:81 -> a
+    175:175:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isTop():0:0 -> a
+    175:175:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):81 -> a
+    176:186:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):82:92 -> a
+    187:187:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> a
+    187:187:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):92 -> a
+    188:189:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):94:95 -> a
+    190:190:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> a
+    190:190:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):95 -> a
+    191:193:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):95:97 -> a
+    194:198:com.android.tools.r8.ir.analysis.type.TypeElement constrainedType(com.android.tools.r8.ir.code.ValueTypeConstraint):94:98 -> a
+    199:199:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):141:141 -> a
+    200:200:boolean com.android.tools.r8.ir.code.Value.verifyCompatible(com.android.tools.r8.ir.code.ValueTypeConstraint):145:145 -> a
+    200:200:boolean verifyCompatible(com.android.tools.r8.ir.code.ValueType):141 -> a
+    201:221:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):229:249 -> a
+    222:222:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    222:222:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):249 -> a
+    223:223:com.android.tools.r8.ir.code.Value getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.function.Predicate):249:249 -> a
+    224:225:com.android.tools.r8.ir.code.Value getSpecificAliasedValue(java.util.function.Predicate):255:256 -> a
+    226:228:void setLocalInfo(com.android.tools.r8.graph.DebugLocalInfo):276:278 -> a
+    229:231:void addDebugLocalEnd(com.android.tools.r8.ir.code.Instruction):288:290 -> a
+    232:236:boolean onlyUsedInBlock(com.android.tools.r8.ir.code.BasicBlock):335:339 -> a
+    237:239:java.util.Set aliasedUsers(com.android.tools.r8.ir.code.AliasedValueConfiguration):367:369 -> a
+    240:247:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):378:385 -> a
+    248:248:void collectAliasedUsersViaAssume(com.android.tools.r8.ir.code.AliasedValueConfiguration,java.util.Set,java.util.Set,java.util.Set):384:384 -> a
+    249:250:void addPhiUser(com.android.tools.r8.ir.code.Phi):524:525 -> a
+    251:253:java.util.Set affectedValues():570:572 -> a
+    254:254:void addAffectedValuesTo(java.util.Set):576:576 -> a
+    255:260:void forEachAffectedValue(java.util.function.Consumer):580:585 -> a
+    261:274:void replaceUsers(com.android.tools.r8.ir.code.Value,java.util.Set):596:609 -> a
+    275:275:void com.android.tools.r8.ir.code.Value.replaceUserInDebugData(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):683:683 -> a
+    275:275:void replaceUsers(com.android.tools.r8.ir.code.Value,java.util.Set):610 -> a
+    276:278:void replaceUsers(com.android.tools.r8.ir.code.Value,java.util.Set):612:614 -> a
+    279:282:void replaceSelectiveInstructionUsers(com.android.tools.r8.ir.code.Value,java.util.function.Predicate):631:634 -> a
+    283:308:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):649:674 -> a
+    309:309:void com.android.tools.r8.ir.code.Value.replaceUserInDebugData(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):683:683 -> a
+    309:309:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):675 -> a
+    310:310:void replaceSelectiveUsers(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Map):676:676 -> a
+    311:312:void setLiveIntervals(com.android.tools.r8.ir.regalloc.LiveIntervals):698:699 -> a
+    313:314:void setNeedsRegister(boolean):713:714 -> a
+    315:315:int compareTo(com.android.tools.r8.ir.code.Value):752:752 -> a
+    316:329:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):837:850 -> a
+    330:330:void setValueRange(com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue):945:945 -> a
+    331:331:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):977:977 -> a
+    332:332: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):982:982 -> a
+    332:332:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):977 -> a
+    333:346:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):999:1012 -> a
+    347:347:boolean com.android.tools.r8.com.google.common.base.Predicate.test(java.lang.Object):79:79 -> a
+    347:347:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1012 -> a
+    348:368:boolean isDead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.function.Predicate,java.util.Set):1015:1035 -> a
+    369:370:void setType(com.android.tools.r8.ir.analysis.type.TypeElement):1054:1055 -> a
+    371:371:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1074:1074 -> a
+    372:373:boolean com.android.tools.r8.ir.code.Value.skipWideningOrNarrowingCheck(com.android.tools.r8.graph.AppView):1086:1087 -> a
+    372:373:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1074 -> a
+    374:374:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1074:1074 -> a
+    375:375:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1457,"2":1458,"3":1459}}
+    1457:1457:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1074:1074 -> a
+    1458:1458:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1074:1074 -> a
+    1459:1459:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1074:1074 -> a
+    1449:1456:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1074:1081 -> a
+    1460:1505:com.android.tools.r8.ir.analysis.type.TypeElement getDynamicUpperBoundType(com.android.tools.r8.graph.AppView):1104:1149 -> a
+    1506:1510:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1166:1170 -> a
+    1511:1511:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.meetNullability(com.android.tools.r8.ir.analysis.type.Nullability):153:153 -> a
+    1511:1511:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1171 -> a
+    1512:1540:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1175:1203 -> a
+    1541:1541:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.ClassTypeElement.meetNullability(com.android.tools.r8.ir.analysis.type.Nullability):153:153 -> a
     1541:1541:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1203 -> a
+    1542:1542:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1204:1204 -> a
+    1543:1543:boolean com.android.tools.r8.ir.analysis.type.Nullability.lessThanOrEqual(com.android.tools.r8.ir.analysis.type.Nullability):83:83 -> a
+    1543:1543:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1204 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1542:1542:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1203:1203 -> a
-    1:15:boolean onlyDependsOnArgument():878:892 -> a0
-    16:16:boolean onlyDependsOnArgument():890:890 -> a0
+    1544:1544:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.Nullability):1204:1204 -> a
+    1:15:boolean onlyDependsOnArgument():879:893 -> a0
+    16:16:boolean onlyDependsOnArgument():891:891 -> a0
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> b
-    1:5:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):467:471 -> b
+    1:5:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):468:472 -> b
     6:6:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():387:387 -> b
-    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):471 -> b
+    6:6:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):472 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():387:387 -> b
-    7:7:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):471 -> b
-    8:9:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):474:475 -> b
-    10:11:void addUser(com.android.tools.r8.ir.code.Instruction):494:495 -> b
-    12:13:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):533:534 -> b
-    14:17:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):689:692 -> b
-    18:18:boolean isDefinedByInstructionSatisfying(java.util.function.Predicate):853:853 -> b
-    19:19:boolean knownToBeBoolean(java.util.Set):903:903 -> b
+    7:7:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):472 -> b
+    8:9:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):475:476 -> b
+    10:11:void addUser(com.android.tools.r8.ir.code.Instruction):495:496 -> b
+    12:13:void fullyRemovePhiUser(com.android.tools.r8.ir.code.Phi):534:535 -> b
+    14:17:void replaceDebugUser(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):690:693 -> b
+    18:18:boolean isDefinedByInstructionSatisfying(java.util.function.Predicate):854:854 -> b
+    19:19:boolean knownToBeBoolean(java.util.Set):904:904 -> b
     20:20:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> b
-    20:20:boolean knownToBeBoolean(java.util.Set):903 -> b
-    21:39:boolean knownToBeBoolean(java.util.Set):907:925 -> b
-    40:40:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1060:1060 -> b
-    41:42:boolean com.android.tools.r8.ir.code.Value.skipWideningOrNarrowingCheck(com.android.tools.r8.graph.AppView):1085:1086 -> b
-    41:42:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1060 -> b
-    43:50:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1060:1067 -> b
-    51:51:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1192:1192 -> b
-    1:1:com.android.tools.r8.ir.code.ValueType outType():790:790 -> b0
-    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):504:505 -> c
-    3:4:void clearPhiUsers():518:519 -> c
-    5:6:void removePhiUser(com.android.tools.r8.ir.code.Phi):528:529 -> c
-    7:7:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1107:1107 -> c
-    1:1:int requiredRegisters():263:263 -> c0
-    1:1:int compareTo(java.lang.Object):53:53 -> compareTo
-    1:5:void clearUsers():509:513 -> d
-    6:10:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):546:550 -> d
-    11:11:boolean lambda$getDynamicUpperBoundType$4(com.android.tools.r8.ir.code.Value):1121:1121 -> d
-    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():357:358 -> d0
+    20:20:boolean knownToBeBoolean(java.util.Set):904 -> b
+    21:39:boolean knownToBeBoolean(java.util.Set):908:926 -> b
+    40:40:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1061:1061 -> b
+    41:42:boolean com.android.tools.r8.ir.code.Value.skipWideningOrNarrowingCheck(com.android.tools.r8.graph.AppView):1086:1087 -> b
+    41:42:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1061 -> b
+    43:50:void widening(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1061:1068 -> b
+    51:51:boolean lambda$getDynamicLowerBoundType$5(com.android.tools.r8.ir.code.Value):1193:1193 -> b
+    1:1:com.android.tools.r8.ir.code.ValueType outType():791:791 -> b0
+    1:2:void fullyRemoveUser(com.android.tools.r8.ir.code.Instruction):505:506 -> c
+    3:4:void clearPhiUsers():519:520 -> c
+    5:6:void removePhiUser(com.android.tools.r8.ir.code.Phi):529:530 -> c
+    7:7:boolean lambda$getDynamicUpperBoundType$3(com.android.tools.r8.ir.code.Value):1108:1108 -> c
+    1:1:int requiredRegisters():264:264 -> c0
+    1:1:int compareTo(java.lang.Object):54:54 -> compareTo
+    1:5:void clearUsers():510:514 -> d
+    6:10:void removeDebugUser(com.android.tools.r8.ir.code.Instruction):547:551 -> d
+    11:11:boolean lambda$getDynamicUpperBoundType$4(com.android.tools.r8.ir.code.Value):1122:1122 -> d
+    1:2:com.android.tools.r8.ir.code.Instruction singleUniqueUser():358:359 -> d0
     boolean lambda$replaceSelectiveUsers$2(com.android.tools.r8.ir.code.Value) -> e
-    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):499:500 -> e
-    3:8:void clearUsersInfo():558:563 -> e
-    1:4:java.util.Set uniquePhiUsers():395:398 -> e0
+    1:2:void removeUser(com.android.tools.r8.ir.code.Instruction):500:501 -> e
+    3:8:void clearUsersInfo():559:564 -> e
+    1:4:java.util.Set uniquePhiUsers():396:399 -> e0
     boolean isPhi() -> f
-    1:4:void linkTo(com.android.tools.r8.ir.code.Value):293:296 -> f
-    1:4:java.util.Set uniqueUsers():346:349 -> f0
-    1:1:void replaceUsers(com.android.tools.r8.ir.code.Value):588:588 -> g
-    1:2:boolean usedInMonitorOperation():485:486 -> g0
+    1:4:void linkTo(com.android.tools.r8.ir.code.Value):294:297 -> f
+    1:4:java.util.Set uniqueUsers():347:350 -> f0
+    1:1:void replaceUsers(com.android.tools.r8.ir.code.Value):589:589 -> g
+    1:2:boolean usedInMonitorOperation():486:487 -> g0
     3:3:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> g0
-    3:3:boolean usedInMonitorOperation():486 -> g0
+    3:3:boolean usedInMonitorOperation():487 -> g0
     com.android.tools.r8.ir.code.Phi asPhi() -> h
-    1:1:int hashCode():756:756 -> hashCode
-    1:1:void computeNeedsRegister():717:717 -> i
-    2:9:boolean com.android.tools.r8.ir.code.Value.internalComputeNeedsRegister():722:729 -> i
-    2:9:void computeNeedsRegister():718 -> i
-    10:10:void computeNeedsRegister():718:718 -> i
-    1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():1090:1090 -> j
-    1:1:java.util.Set debugUsers():402:402 -> k
-    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():390:391 -> l
-    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():219:219 -> n
-    2:2:com.android.tools.r8.ir.code.Value getAliasedValue():218:218 -> n
-    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():794:795 -> o
-    1:3:java.util.Set getDebugLocalEnds():281:283 -> p
-    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():199:200 -> q
-    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():702:702 -> r
-    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():267:267 -> s
-    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():326:326 -> t
+    1:1:int hashCode():757:757 -> hashCode
+    1:1:void computeNeedsRegister():718:718 -> i
+    2:9:boolean com.android.tools.r8.ir.code.Value.internalComputeNeedsRegister():723:730 -> i
+    2:9:void computeNeedsRegister():719 -> i
+    10:10:void computeNeedsRegister():719:719 -> i
+    1:1:com.android.tools.r8.ir.code.BasicBlock getBlock():1091:1091 -> j
+    1:1:java.util.Set debugUsers():403:403 -> k
+    1:2:com.android.tools.r8.ir.code.Phi firstPhiUser():391:392 -> l
+    1:1:com.android.tools.r8.ir.code.Value getAliasedValue():220:220 -> n
+    2:2:com.android.tools.r8.ir.code.Value getAliasedValue():219:219 -> n
+    1:2:com.android.tools.r8.ir.code.ConstInstruction getConstInstruction():795:796 -> o
+    1:3:java.util.Set getDebugLocalEnds():282:284 -> p
+    1:2:com.android.tools.r8.ir.code.Instruction getDefinition():200:201 -> q
+    1:1:com.android.tools.r8.ir.regalloc.LiveIntervals getLiveIntervals():703:703 -> r
+    1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():268:268 -> s
+    1:1:com.android.tools.r8.ir.code.Value getNextConsecutive():327:327 -> t
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":788,"2":789,"3":790}}
-    788:788:java.lang.String toString():761:761 -> toString
-    789:789:java.lang.String toString():761:761 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":789,"2":790,"3":791}}
+    789:789:java.lang.String toString():762:762 -> toString
     790:790:java.lang.String toString():762:762 -> toString
-    764:787:java.lang.String toString():763:786 -> toString
-    1:1:int getNumber():259:259 -> u
-    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getPreviousConsecutive():330:330 -> v
-    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():319 -> v
+    791:791:java.lang.String toString():763:763 -> toString
+    765:788:java.lang.String toString():764:787 -> toString
+    1:1:int getNumber():260:260 -> u
+    1:1:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getPreviousConsecutive():331:331 -> v
+    1:1:com.android.tools.r8.ir.code.Value getStartOfConsecutive():320 -> v
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1094:1094 -> w
-    1:11:com.android.tools.r8.utils.LongInterval getValueRange():960:970 -> x
-    1:1:boolean hasAnyUsers():406:406 -> y
-    1:1:boolean hasDebugUsers():410:410 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.Y30:
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():1095:1095 -> w
+    1:11:com.android.tools.r8.utils.LongInterval getValueRange():961:971 -> x
+    1:1:boolean hasAnyUsers():407:407 -> y
+    1:1:boolean hasDebugUsers():411:411 -> z
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.u40:
     com.android.tools.r8.graph.DebugLocalInfo local -> a
     java.util.Set users -> b
-    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):159:159 -> <init>
-    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):157:160 -> <init>
-com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.b40:
+    1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):160:160 -> <init>
+    2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):158:161 -> <init>
+com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.x40:
     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.i40:
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.E40:
     com.android.tools.r8.ir.code.ValueType LONG -> e
     com.android.tools.r8.ir.code.ValueType DOUBLE -> f
     com.android.tools.r8.ir.code.ValueType INT -> c
@@ -52771,14 +52893,14 @@
     15:15:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():166:166 -> d
     1:1:com.android.tools.r8.ir.code.ValueType[] values():17:17 -> e
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():35:35 -> m
-com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.h40:
+com.android.tools.r8.ir.code.ValueType$1 -> com.android.tools.r8.internal.D40:
     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>():147:147 -> <clinit>
     2:2:void <clinit>():110:110 -> <clinit>
     3:3:void <clinit>():59:59 -> <clinit>
-com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.k40:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.G40:
     com.android.tools.r8.ir.code.ValueTypeConstraint INT -> c
     com.android.tools.r8.ir.code.ValueTypeConstraint OBJECT -> b
     com.android.tools.r8.ir.code.ValueTypeConstraint LONG -> g
@@ -52839,7 +52961,7 @@
     78:80:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):155:157 -> a
     81:81:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):137:137 -> a
     1:1:com.android.tools.r8.ir.code.ValueTypeConstraint[] values():13:13 -> b
-com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.j40:
+com.android.tools.r8.ir.code.ValueTypeConstraint$1 -> com.android.tools.r8.internal.F40:
     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
@@ -52848,9 +52970,9 @@
     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.j50:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.F50:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.x60:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.T60:
     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>
     com.android.tools.r8.ir.code.Xor asXor() -> J0
     java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor) -> a
@@ -52888,7 +53010,7 @@
     int element_width -> a
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.ArrayFilledDataPayloadResolver$1):17:17 -> <init>
-com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.e7:
+com.android.tools.r8.ir.conversion.CfBuilder -> com.android.tools.r8.internal.h7:
     com.android.tools.r8.ir.code.Position currentPosition -> h
     java.util.Map newInstanceLabels -> q
     java.util.List thisInitializers -> p
@@ -53138,7 +53260,7 @@
     425:425:com.android.tools.r8.cf.code.frame.PreciseFrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):631 -> a
     426:426:com.android.tools.r8.cf.code.frame.UninitializedFrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):642:642 -> a
     426:426:com.android.tools.r8.cf.code.frame.PreciseFrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):631 -> a
-    427:427:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):84:84 -> a
+    427:427:com.android.tools.r8.cf.code.frame.UninitializedNew com.android.tools.r8.cf.code.frame.FrameType.uninitializedNew(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.graph.DexType):83:83 -> a
     427:427:com.android.tools.r8.cf.code.frame.UninitializedFrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):642 -> a
     427:427:com.android.tools.r8.cf.code.frame.PreciseFrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):631 -> a
     428:457:com.android.tools.r8.cf.code.frame.UninitializedFrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):644:673 -> a
@@ -53154,14 +53276,14 @@
     464:464:void add(com.android.tools.r8.cf.code.CfInstruction[]):706:706 -> a
     465:465:boolean verifyNoMetadata(com.android.tools.r8.ir.code.Instruction):714:714 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):689:689 -> b
-com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.d7:
+com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker -> com.android.tools.r8.internal.g7:
     int height -> b
     boolean $assertionsDisabled -> c
     int maxHeight -> a
     1:1:void <clinit>():110:110 -> <clinit>
     1:3:void <init>():110:112 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):110:110 -> <init>
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.P8:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.S8:
     int currentInstructionIndex -> o
     com.android.tools.r8.graph.CfCode code -> h
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> a
@@ -53192,10 +53314,10 @@
     void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
     1:3:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):304:306 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     4:4:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):306 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     5:5:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):306 -> a
     6:8:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):306:306 -> a
     10:11:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):308:309 -> a
@@ -53475,16 +53597,16 @@
     399:399:int[] getTargets(int):367:367 -> i
     377:393:int[] getTargets(int):368:384 -> i
     394:395:int[] getTargets(int):364:365 -> i
-com.android.tools.r8.ir.conversion.CfSourceCode$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.L8:
+com.android.tools.r8.ir.conversion.CfSourceCode$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.O8:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:6:java.lang.String com.android.tools.r8.ir.conversion.CfSourceCode$$InternalSyntheticOutline$166$438dbc8eceffdeb61d226aaaed697fac8e37ed1b14c877d9379a82f963ca1ee0$0.m(java.lang.String,int,java.lang.String):0:5 -> a
       # {"id":"com.android.tools.r8.synthesized"}
       # {"id":"com.android.tools.r8.outline"}
-com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.M8:
+com.android.tools.r8.ir.conversion.CfSourceCode$1 -> com.android.tools.r8.internal.P8:
     int[] $SwitchMap$com$android$tools$r8$ir$code$ValueType -> a
     1:1:void <clinit>():811:811 -> <clinit>
-com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.N8:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.Q8:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap locals -> c
     int endOffset -> b
     int startOffset -> a
@@ -53493,7 +53615,7 @@
     13:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():119:119 -> a
     13:13:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):170 -> a
     14:19:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):172:177 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.O8:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.R8:
     java.util.List guards -> c
     boolean $assertionsDisabled -> e
     int endOffset -> b
@@ -53501,13 +53623,13 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList offsets -> d
     1:1:void <clinit>():71:71 -> <clinit>
     1:5:void <init>(int,int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):78:82 -> <init>
-com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.Q8:
+com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.T8:
     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.c9:
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.f9:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> a
     com.android.tools.r8.ir.code.Position position -> b
     boolean $assertionsDisabled -> c
@@ -53612,7 +53734,7 @@
     6:6:void com.android.tools.r8.ir.conversion.CfState.updateState(com.android.tools.r8.ir.conversion.CfState$Snapshot):183:183 -> e
     6:6:com.android.tools.r8.ir.conversion.CfState$Slot pop():188 -> e
     1:1:java.lang.String toString():236:236 -> toString
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.T8:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.W8:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> c
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> d
     boolean $assertionsDisabled -> e
@@ -53640,7 +53762,7 @@
     436:436:java.lang.String toString():419:419 -> toString
     437:437:java.lang.String toString():419:419 -> toString
     421:434:java.lang.String toString():420:433 -> toString
-com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.U8:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.X8:
     int stackHeight -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():476:476 -> <clinit>
@@ -53649,7 +53771,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.V8:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.Y8:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():437:437 -> <clinit>
@@ -53692,7 +53814,7 @@
     3:3:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> d
     3:3: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.W8:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.Z8:
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> d
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> e
@@ -53715,12 +53837,12 @@
     277:277:java.lang.String toString():272:272 -> toString
     278:278:java.lang.String toString():272:272 -> toString
     275:275:java.lang.String toString():272:272 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.Z8:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.c9:
     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.X8:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.a9:
     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
@@ -53731,7 +53853,7 @@
     75:75:java.lang.String toString():72:72 -> toString
     76:76:java.lang.String toString():72:72 -> toString
     73:73:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.Y8:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.b9:
     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
@@ -53742,7 +53864,7 @@
     46:46:java.lang.String toString():43:43 -> toString
     47:47:java.lang.String toString():43:43 -> toString
     44:44:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.a9:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.d9:
     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>
@@ -53756,7 +53878,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.b9:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.e9:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():508:508 -> <clinit>
@@ -53765,7 +53887,7 @@
     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.internal.aa:
+com.android.tools.r8.ir.conversion.ClassConverter -> com.android.tools.r8.internal.da:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> c
     boolean $assertionsDisabled -> e
@@ -53781,10 +53903,10 @@
     5:5:java.util.List lambda$getDeterministicNestWaves$0(com.android.tools.r8.graph.DexType):76:76 -> a
     6:7:boolean lambda$getDeterministicNestWaves$1(java.util.List,int,com.android.tools.r8.graph.DexType,java.util.List):94:95 -> a
     8:12:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):116:120 -> a
-    13:13:void com.android.tools.r8.ir.conversion.IRConverter.classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):408:408 -> a
+    13:13:void com.android.tools.r8.ir.conversion.IRConverter.classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):415:415 -> a
     13:13:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):120 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:15:void com.android.tools.r8.ir.conversion.IRConverter.classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):408:409 -> a
+    14:15:void com.android.tools.r8.ir.conversion.IRConverter.classSynthesisDesugaring(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):415:416 -> a
     14:15:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):120 -> a
     16:29:void internalConvertClasses(com.android.tools.r8.ir.conversion.ClassConverterResult$Builder,java.util.concurrent.ExecutorService):121:134 -> a
     30:33:java.util.List com.android.tools.r8.ir.conversion.ClassConverter.filterOutClassesInNests(java.util.Collection):104:107 -> a
@@ -53797,27 +53919,27 @@
     1:25:java.util.Deque getDeterministicNestWaves(java.util.Collection):73:97 -> b
     26:26:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):216:216 -> b
     1:1:void lambda$internalConvertClasses$2(com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.DexProgramClass):155:155 -> c
-com.android.tools.r8.ir.conversion.ClassConverter$DefaultClassConverter -> com.android.tools.r8.internal.Y9:
+com.android.tools.r8.ir.conversion.ClassConverter$DefaultClassConverter -> com.android.tools.r8.internal.ba:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):228:228 -> <init>
     void notifyAllClassesConverted() -> a
     1:1:void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):234:234 -> a
-com.android.tools.r8.ir.conversion.ClassConverter$LibraryDesugaredClassConverter -> com.android.tools.r8.internal.Z9:
+com.android.tools.r8.ir.conversion.ClassConverter$LibraryDesugaredClassConverter -> com.android.tools.r8.internal.ca:
     java.util.Set alreadyLibraryDesugared -> f
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):252:252 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):245:245 -> <init>
     1:5:void convertClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer):260:264 -> a
     6:6:void notifyAllClassesConverted():270:270 -> a
-com.android.tools.r8.ir.conversion.ClassConverterResult -> com.android.tools.r8.internal.ca:
+com.android.tools.r8.ir.conversion.ClassConverterResult -> com.android.tools.r8.internal.fa:
     java.util.Map forcefullyMovedLambdaMethods -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.ir.conversion.ClassConverterResult$1):12:12 -> <init>
     2:3:void <init>(java.util.Map):16:17 -> <init>
     1:1:java.util.Map getForcefullyMovedLambdaMethods():25:25 -> a
-com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.ba:
+com.android.tools.r8.ir.conversion.ClassConverterResult$Builder -> com.android.tools.r8.internal.ea:
     java.util.Map forcefullyMovedLambdaMethods -> a
     1:3:void <init>():28:30 -> <init>
     1:1:void acceptForcefullyMovedLambdaMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):34:34 -> b
     2:2:com.android.tools.r8.ir.conversion.ClassConverterResult build():38:38 -> b
-com.android.tools.r8.ir.conversion.D8MethodProcessor -> com.android.tools.r8.internal.Ge:
+com.android.tools.r8.ir.conversion.D8MethodProcessor -> com.android.tools.r8.internal.Ke:
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> f
     java.util.Set scheduled -> c
     java.util.List nonTerminalFutures -> e
@@ -53855,7 +53977,7 @@
     1:1:void newWave():56:56 -> d
     1:6:com.android.tools.r8.utils.Timing lambda$scheduleDesugaredMethodForProcessing$1(com.android.tools.r8.graph.ProgramMethod):111:111 -> e
     7:8:boolean verifyNoPendingMethodProcessing():157:158 -> e
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.Rg:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.Vg:
     int outRegisterCount -> n
     boolean hasBackwardsBranch -> o
     int inRegisterCount -> m
@@ -53873,553 +53995,569 @@
     com.android.tools.r8.ir.regalloc.RegisterAllocator registerAllocator -> c
     com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadata$Builder bytecodeMetadataBuilder -> b
     java.util.List fillArrayDataInfos -> g
-    1:1:void <clinit>():84:84 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):134:134 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.MethodConversionOptions):142:142 -> <init>
-    3:53:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.MethodConversionOptions):100:150 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info access$000(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):84:84 -> a
-    2:2:com.android.tools.r8.ir.conversion.DexBuilder$Info access$100(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.Instruction):84:84 -> a
-    3:3:boolean access$202(com.android.tools.r8.ir.conversion.DexBuilder,boolean):84:84 -> a
-    4:9:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):159:164 -> a
-    10:12:com.android.tools.r8.ir.conversion.DexBuilder$Info com.android.tools.r8.ir.conversion.DexBuilder.buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):173:175 -> a
-    10:12:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):166 -> a
-    13:15:com.android.tools.r8.ir.conversion.DexBuilder$Info com.android.tools.r8.ir.conversion.DexBuilder.buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):173:175 -> a
-    13:15:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):167 -> a
-    16:16:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):168:168 -> a
-    17:17:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):403:403 -> a
-    18:56:void com.android.tools.r8.ir.conversion.DexBuilder.removeTrivialFallthroughBlocks(com.android.tools.r8.ir.code.IRCode):355:393 -> a
-    18:56:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):410 -> a
-    57:80:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):413:436 -> a
-    81:83:boolean com.android.tools.r8.ir.conversion.DexBuilder.isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):349:351 -> a
-    81:83:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):437 -> a
-    84:109:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):439:464 -> a
-    110:110: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
-    110:110:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):464 -> a
-    111:111:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):465:465 -> a
-    112:112:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():119:119 -> a
-    112:112:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):465 -> a
-    113:116:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):469:472 -> a
-    117:117:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
-    117:117:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):472 -> a
-    118:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):474:479 -> a
-    124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":650,"2":651,"3":652}}
-    650:650:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):480:480 -> a
-    651:651:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):480:480 -> a
-    652:652:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):480:480 -> a
-    601:617:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):477:493 -> a
-    618:619:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
-    618:619:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
-    618:619:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):493 -> a
-    620:620:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):496:496 -> a
-    621:621:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
-    621:621:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):497 -> a
-    622:622:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):498:498 -> a
-    623:623:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):635:635 -> a
-    623:623:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):499 -> a
-    624:626:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):643:645 -> a
-    624:626:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):637 -> a
-    624:626:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):499 -> a
-    627:627:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):638:638 -> a
-    627:627:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):499 -> a
-    628:641:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):501:514 -> a
-    642:642:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1067:1067 -> a
-    642:642:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):515 -> a
-    643:649:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):517:523 -> a
-    653:662:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():539:548 -> a
-    653:662:com.android.tools.r8.graph.DexCode build():207 -> a
-    663:663:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1225:1225 -> a
-    663:663:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():550 -> a
+    1:1:void <clinit>():85:85 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):135:135 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.MethodConversionOptions):143:143 -> <init>
+    3:53:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.MethodConversionOptions):101:151 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info access$000(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):85:85 -> a
+    2:2:com.android.tools.r8.ir.conversion.DexBuilder$Info access$100(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.Instruction):85:85 -> a
+    3:3:boolean access$202(com.android.tools.r8.ir.conversion.DexBuilder,boolean):85:85 -> a
+    4:9:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):160:165 -> a
+    10:12:com.android.tools.r8.ir.conversion.DexBuilder$Info com.android.tools.r8.ir.conversion.DexBuilder.buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):174:176 -> a
+    10:12:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):167 -> a
+    13:15:com.android.tools.r8.ir.conversion.DexBuilder$Info com.android.tools.r8.ir.conversion.DexBuilder.buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):174:176 -> a
+    13:15:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):168 -> a
+    16:16:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.conversion.MethodConversionOptions):169:169 -> a
+    17:17:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):432:432 -> a
+    18:42:void com.android.tools.r8.ir.conversion.DexBuilder.removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):356:380 -> a
+    18:42:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):439 -> a
+    43:60:boolean com.android.tools.r8.ir.conversion.DexBuilder.isFallthroughTargetToNonFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.IRCode):406:423 -> a
+    43:60:void com.android.tools.r8.ir.conversion.DexBuilder.removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):387 -> a
+    43:60:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):439 -> a
+    61:61:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":691,"2":692,"3":693}}
+    691:691:boolean com.android.tools.r8.ir.conversion.DexBuilder.isFallthroughTargetToNonFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.IRCode):424:424 -> a
+    691:691:void com.android.tools.r8.ir.conversion.DexBuilder.removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):387 -> a
+    691:691:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):439 -> a
+    692:692:boolean com.android.tools.r8.ir.conversion.DexBuilder.isFallthroughTargetToNonFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.IRCode):424:424 -> a
+    692:692:void com.android.tools.r8.ir.conversion.DexBuilder.removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):387 -> a
+    692:692:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):439 -> a
+    693:693:boolean com.android.tools.r8.ir.conversion.DexBuilder.isFallthroughTargetToNonFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,int,com.android.tools.r8.ir.code.IRCode):424:424 -> a
+    693:693:void com.android.tools.r8.ir.conversion.DexBuilder.removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):387 -> a
+    693:693:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):439 -> a
+    62:68:void com.android.tools.r8.ir.conversion.DexBuilder.removeTrivialGotoBlocks(com.android.tools.r8.ir.code.IRCode):393:399 -> a
+    62:68:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):439 -> a
+    69:92:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):442:465 -> a
+    93:95:boolean com.android.tools.r8.ir.conversion.DexBuilder.isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):350:352 -> a
+    93:95:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):466 -> a
+    96:121:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):468:493 -> a
+    122:122: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
+    122:122:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):493 -> a
+    123:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):494:494 -> a
+    124:124:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>():119:119 -> a
+    124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):494 -> a
+    125:128:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):498:501 -> a
+    129:129:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
+    129:129:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):501 -> a
+    130:135:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):503:508 -> a
+    136:136:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":694,"2":695,"3":696}}
+    694:694:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):509:509 -> a
+    695:695:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):509:509 -> a
+    696:696:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):509:509 -> a
+    642:658:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):506:522 -> a
+    659:660:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,float):155:156 -> a
+    659:660:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167 -> a
+    659:660:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):522 -> a
+    661:661:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):525:525 -> a
+    662:662:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
+    662:662:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):526 -> a
+    663:663:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):527:527 -> a
+    664:664:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock) -> a
+    664:664:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):528 -> a
+    665:667:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):672:674 -> a
+    665:667:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):666 -> a
+    665:667:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):528 -> a
+    668:668:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):667:667 -> a
+    668:668:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):528 -> a
+    669:682:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):530:543 -> a
+    683:683:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1067:1067 -> a
+    683:683:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):544 -> a
+    684:690:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):546:552 -> a
+    697:706:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():568:577 -> a
+    697:706:com.android.tools.r8.graph.DexCode build():208 -> a
+    707:707:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1225:1225 -> a
+    707:707:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():579 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    663:663:com.android.tools.r8.graph.DexCode build():207 -> a
-    664:664:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1225:1225 -> a
-    664:664:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():550 -> a
-    664:664:com.android.tools.r8.graph.DexCode build():207 -> a
-    665:665:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():550:550 -> a
-    665:665:com.android.tools.r8.graph.DexCode build():207 -> a
-    666:672:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():549:555 -> a
-    666:672:com.android.tools.r8.graph.DexCode build():207 -> a
-    673:673:com.android.tools.r8.graph.DexCode build():211:211 -> a
-    674:679:void com.android.tools.r8.ir.conversion.DexBuilder.reset():183:188 -> a
-    674:679:com.android.tools.r8.graph.DexCode build():214 -> a
-    680:680:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):712:712 -> a
-    680:680:void com.android.tools.r8.ir.conversion.DexBuilder.reset():188 -> a
-    680:680:com.android.tools.r8.graph.DexCode build():214 -> a
-    681:684:void com.android.tools.r8.ir.conversion.DexBuilder.reset():188:191 -> a
-    681:684:com.android.tools.r8.graph.DexCode build():214 -> a
-    685:770:com.android.tools.r8.graph.DexCode build():219:304 -> a
-    771:790:com.android.tools.r8.dex.code.DexNop com.android.tools.r8.ir.conversion.DexBuilder.createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):764:783 -> a
-    771:790:com.android.tools.r8.graph.DexCode build():307 -> a
-    791:805:com.android.tools.r8.graph.DexCode build():308:322 -> a
-    806:806:com.android.tools.r8.dex.code.DexFillArrayDataPayload com.android.tools.r8.ir.code.NewArrayFilledData.createPayload():54:54 -> a
-    806:806:com.android.tools.r8.graph.DexCode build():322 -> a
-    807:810:com.android.tools.r8.graph.DexCode build():323:326 -> a
-    811:813:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():790:792 -> a
-    811:813:com.android.tools.r8.graph.DexCode build():330 -> a
-    814:819:com.android.tools.r8.graph.DexCode$Try[] com.android.tools.r8.ir.conversion.DexBuilder.getDexTryItems(java.util.List,java.util.Map):893:898 -> a
-    814:819:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():794 -> a
-    814:819:com.android.tools.r8.graph.DexCode build():330 -> a
-    820:820:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():795:795 -> a
-    820:820:com.android.tools.r8.graph.DexCode build():330 -> a
-    821:838:com.android.tools.r8.graph.DexCode$TryHandler[] com.android.tools.r8.ir.conversion.DexBuilder.getDexTryHandlers(java.util.Map):904:921 -> a
-    821:838:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():795 -> a
-    821:838:com.android.tools.r8.graph.DexCode build():330 -> a
-    839:848:com.android.tools.r8.graph.DexCode build():333:342 -> a
-    849:850:void requestOutgoingRegisters(int):565:566 -> a
-    851:851:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):571:571 -> a
-    852:855:void addGoto(com.android.tools.r8.ir.code.Goto):581:584 -> a
-    856:870:boolean com.android.tools.r8.ir.conversion.DexBuilder.needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.dex.code.DexInstanceOf):589:603 -> a
-    856:870:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.dex.code.DexInstanceOf):613 -> a
-    871:873:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.dex.code.DexInstanceOf):614:616 -> a
-    874:875:void addIf(com.android.tools.r8.ir.code.If):621:622 -> a
-    876:876:void addMove(com.android.tools.r8.ir.code.Move):626:626 -> a
-    877:877:void addNop(com.android.tools.r8.ir.code.Instruction):649:649 -> a
-    878:880:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):659:661 -> a
-    881:882:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction[]):665:666 -> a
-    883:885:void addSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.dex.code.DexFormat31t):670:672 -> a
-    886:887:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.dex.code.DexFillArrayData):676:677 -> a
-    888:889:void addArgument(com.android.tools.r8.ir.code.Argument):681:682 -> a
-    890:892:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.dex.code.DexInstruction):686:688 -> a
-    893:897:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.dex.code.DexInstruction):687:691 -> a
-    898:898:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):696:696 -> a
-    899:900:void com.android.tools.r8.ir.conversion.DexBuilder.setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):730:731 -> a
-    899:900:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):698 -> a
-    901:907:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):701:707 -> a
-    908:912:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):722:726 -> a
-    908:912:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):708 -> a
-    913:913:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):712:712 -> a
-    913:913:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):726 -> a
-    913:913:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):708 -> a
-    914:914:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):726:726 -> a
-    914:914:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):708 -> a
-    915:926:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):735:746 -> a
-    927:932:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.DexBuilder.computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):754:759 -> a
-    927:932:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):747 -> a
-    933:936:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):747:750 -> a
-    937:949:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):801:813 -> a
-    950:950:boolean com.android.tools.r8.ir.code.CatchHandlers.isEmpty():55:55 -> a
-    950:950:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):813 -> a
+    707:707:com.android.tools.r8.graph.DexCode build():208 -> a
+    708:708:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1225:1225 -> a
+    708:708:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():579 -> a
+    708:708:com.android.tools.r8.graph.DexCode build():208 -> a
+    709:709:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():579:579 -> a
+    709:709:com.android.tools.r8.graph.DexCode build():208 -> a
+    710:716:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():578:584 -> a
+    710:716:com.android.tools.r8.graph.DexCode build():208 -> a
+    717:717:com.android.tools.r8.graph.DexCode build():212:212 -> a
+    718:723:void com.android.tools.r8.ir.conversion.DexBuilder.reset():184:189 -> a
+    718:723:com.android.tools.r8.graph.DexCode build():215 -> a
+    724:724:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):741:741 -> a
+    724:724:void com.android.tools.r8.ir.conversion.DexBuilder.reset():189 -> a
+    724:724:com.android.tools.r8.graph.DexCode build():215 -> a
+    725:728:void com.android.tools.r8.ir.conversion.DexBuilder.reset():189:192 -> a
+    725:728:com.android.tools.r8.graph.DexCode build():215 -> a
+    729:814:com.android.tools.r8.graph.DexCode build():220:305 -> a
+    815:834:com.android.tools.r8.dex.code.DexNop com.android.tools.r8.ir.conversion.DexBuilder.createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):793:812 -> a
+    815:834:com.android.tools.r8.graph.DexCode build():308 -> a
+    835:849:com.android.tools.r8.graph.DexCode build():309:323 -> a
+    850:850:com.android.tools.r8.dex.code.DexFillArrayDataPayload com.android.tools.r8.ir.code.NewArrayFilledData.createPayload():54:54 -> a
+    850:850:com.android.tools.r8.graph.DexCode build():323 -> a
+    851:854:com.android.tools.r8.graph.DexCode build():324:327 -> a
+    855:857:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():819:821 -> a
+    855:857:com.android.tools.r8.graph.DexCode build():331 -> a
+    858:863:com.android.tools.r8.graph.DexCode$Try[] com.android.tools.r8.ir.conversion.DexBuilder.getDexTryItems(java.util.List,java.util.Map):922:927 -> a
+    858:863:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():823 -> a
+    858:863:com.android.tools.r8.graph.DexCode build():331 -> a
+    864:864:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():824:824 -> a
+    864:864:com.android.tools.r8.graph.DexCode build():331 -> a
+    865:882:com.android.tools.r8.graph.DexCode$TryHandler[] com.android.tools.r8.ir.conversion.DexBuilder.getDexTryHandlers(java.util.Map):933:950 -> a
+    865:882:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():824 -> a
+    865:882:com.android.tools.r8.graph.DexCode build():331 -> a
+    883:892:com.android.tools.r8.graph.DexCode build():334:343 -> a
+    893:894:void requestOutgoingRegisters(int):594:595 -> a
+    895:895:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):600:600 -> a
+    896:899:void addGoto(com.android.tools.r8.ir.code.Goto):610:613 -> a
+    900:914:boolean com.android.tools.r8.ir.conversion.DexBuilder.needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.dex.code.DexInstanceOf):618:632 -> a
+    900:914:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.dex.code.DexInstanceOf):642 -> a
+    915:917:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.dex.code.DexInstanceOf):643:645 -> a
+    918:919:void addIf(com.android.tools.r8.ir.code.If):650:651 -> a
+    920:920:void addMove(com.android.tools.r8.ir.code.Move):655:655 -> a
+    921:921:void addNop(com.android.tools.r8.ir.code.Instruction):678:678 -> a
+    922:924:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):688:690 -> a
+    925:926:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction[]):694:695 -> a
+    927:929:void addSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.dex.code.DexFormat31t):699:701 -> a
+    930:931:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.dex.code.DexFillArrayData):705:706 -> a
+    932:933:void addArgument(com.android.tools.r8.ir.code.Argument):710:711 -> a
+    934:936:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.dex.code.DexInstruction):715:717 -> a
+    937:941:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.dex.code.DexInstruction):716:720 -> a
+    942:942:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):725:725 -> a
+    943:944:void com.android.tools.r8.ir.conversion.DexBuilder.setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):759:760 -> a
+    943:944:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):727 -> a
+    945:951:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):730:736 -> a
+    952:956:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):751:755 -> a
+    952:956:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):737 -> a
+    957:957:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):741:741 -> a
+    957:957:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):755 -> a
+    957:957:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):737 -> a
+    958:958:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):755:755 -> a
+    958:958:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):737 -> a
+    959:970:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):764:775 -> a
+    971:976:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.DexBuilder.computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):783:788 -> a
+    971:976:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):776 -> a
+    977:980:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):776:779 -> a
+    981:993:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):830:842 -> a
+    994:994:boolean com.android.tools.r8.ir.code.CatchHandlers.isEmpty():55:55 -> a
+    994:994:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):842 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    951:951:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):813:813 -> a
-    952:952:boolean com.android.tools.r8.ir.code.CatchHandlers.isEmpty():55:55 -> a
-    952:952:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):814 -> a
+    995:995:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):842:842 -> a
+    996:996:boolean com.android.tools.r8.ir.code.CatchHandlers.isEmpty():55:55 -> a
+    996:996:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):843 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    953:987:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):815:849 -> a
-    988:992:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):881:885 -> a
-    988:992:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):849 -> a
-    993:993:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):849:849 -> a
-    994:994:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):888:888 -> a
-    994:994:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):849 -> a
-    995:1019:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):851:875 -> a
-    1020:1024:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):881:885 -> a
-    1020:1024:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):875 -> a
-    1025:1025:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):875:875 -> a
-    1026:1026:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):888:888 -> a
-    1026:1026:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):875 -> a
-    1:1:void com.android.tools.r8.ir.conversion.DexBuilder.needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):561:561 -> b
-    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):84 -> b
+    997:1031:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):844:878 -> a
+    1032:1036:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):910:914 -> a
+    1032:1036:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):878 -> a
+    1037:1037:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):878:878 -> a
+    1038:1038:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):917:917 -> a
+    1038:1038:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):878 -> a
+    1039:1063:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):880:904 -> a
+    1064:1068:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):910:914 -> a
+    1064:1068:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):904 -> a
+    1069:1069:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):904:904 -> a
+    1070:1070:int com.android.tools.r8.ir.conversion.DexBuilder.trimEnd(com.android.tools.r8.ir.code.BasicBlock):917:917 -> a
+    1070:1070:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):904 -> a
+    1:1:void com.android.tools.r8.ir.conversion.DexBuilder.needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):590:590 -> b
+    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):85 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:void com.android.tools.r8.ir.conversion.DexBuilder.needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):561:561 -> b
-    2:2:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):84 -> b
-    3:3:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):577:577 -> b
-    4:4:void addNothing(com.android.tools.r8.ir.code.Instruction):630:630 -> b
-    5:5:com.android.tools.r8.utils.InternalOptions getOptions():927:927 -> b
-    1:2:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):717:718 -> c
-    3:3:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):712:712 -> c
-    3:3:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):718 -> c
-    4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):718:718 -> c
-    5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():931:931 -> c
-    1:1:boolean isBuildingForComparison():179:179 -> d
-com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.Gg:
+    2:2:void com.android.tools.r8.ir.conversion.DexBuilder.needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):590:590 -> b
+    2:2:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):85 -> b
+    3:3:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):606:606 -> b
+    4:4:void addNothing(com.android.tools.r8.ir.code.Instruction):659:659 -> b
+    5:5:com.android.tools.r8.utils.InternalOptions getOptions():956:956 -> b
+    1:2:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):746:747 -> c
+    3:3:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):741:741 -> c
+    3:3:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):747 -> c
+    4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):747:747 -> c
+    5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():960:960 -> c
+    1:1:boolean isBuildingForComparison():180:180 -> d
+com.android.tools.r8.ir.conversion.DexBuilder$1 -> com.android.tools.r8.internal.Kg:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
-    1:1:void <clinit>():1330:1330 -> <clinit>
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.Hg:
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1100:1100 -> <init>
+    1:1:void <clinit>():1359:1359 -> <clinit>
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.Lg:
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1129:1129 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1128:1128 -> a
+    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1157:1157 -> a
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.Ig:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.Mg:
     com.android.tools.r8.dex.code.DexFillArrayData 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.dex.code.DexFillArrayData):1576:1578 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.Jg:
+    1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.dex.code.DexFillArrayData):1605:1607 -> <init>
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.Ng:
     com.android.tools.r8.dex.code.DexInstruction instruction -> e
-    1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):1007:1008 -> <init>
-    1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1028:1029 -> a
-    3:3:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1034:1034 -> a
-    4:5:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1039:1040 -> a
-    1:1:int getSize():1013:1013 -> d
-    1:1:int maxSize():1023:1023 -> e
-    1:1:int minSize():1018:1018 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.Kg:
+    1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction):1036:1037 -> <init>
+    1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1057:1058 -> a
+    3:3:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1063:1063 -> a
+    4:5:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1068:1069 -> a
+    1:1:int getSize():1042:1042 -> d
+    1:1:int maxSize():1052:1052 -> e
+    1:1:int minSize():1047:1047 -> f
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.Og:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1132:1132 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1137:1137 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1134:1134 -> <init>
-    1:1:com.android.tools.r8.ir.code.Goto com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo.getJump():1141:1141 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1205 -> a
-    2:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1206:1250 -> a
+    1:1:void <clinit>():1161:1161 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1166:1166 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1163:1163 -> <init>
+    1:1:com.android.tools.r8.ir.code.Goto com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo.getJump():1170:1170 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1234 -> a
+    2:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1235:1279 -> a
     47:47:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1323,"2":1324,"3":1325}}
-    1323:1323:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1250:1250 -> a
-    1324:1324:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1250:1250 -> a
-    1325:1325:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1250:1250 -> a
-    1297:1297:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1250:1250 -> a
-    1298:1302:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1239:1243 -> a
-    1303:1322:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1234:1253 -> a
-    1326:1326:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1164:1164 -> a
-    1327:1327:com.android.tools.r8.ir.code.Goto com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo.getJump():1141:1141 -> a
-    1327:1327:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1165 -> a
-    1328:1362:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1166:1200 -> a
-    1363:1363:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1259:1259 -> a
-    1:2:int getSize():1146:1147 -> d
-    1:1:int maxSize():1158:1158 -> e
-    1:1:int minSize():1152:1152 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.Lg:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1352,"2":1353,"3":1354}}
+    1352:1352:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1279:1279 -> a
+    1353:1353:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1279:1279 -> a
+    1354:1354:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1279:1279 -> a
+    1326:1326:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1279:1279 -> a
+    1327:1331:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1268:1272 -> a
+    1332:1351:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1263:1282 -> a
+    1355:1355:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1193:1193 -> a
+    1356:1356:com.android.tools.r8.ir.code.Goto com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo.getJump():1170:1170 -> a
+    1356:1356:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1194 -> a
+    1357:1391:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1195:1229 -> a
+    1392:1392:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1288:1288 -> a
+    1:2:int getSize():1175:1176 -> d
+    1:1:int maxSize():1187:1187 -> e
+    1:1:int minSize():1181:1181 -> f
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.Pg:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1263:1263 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.If):1268:1268 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.If):1265:1265 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    1:1:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1311 -> a
-    2:2:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1311 -> a
-    3:4:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1312:1313 -> a
-    5:5:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    5:5:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    5:5:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    5:5:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1315 -> a
-    6:6:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    6:6:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    6:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1315 -> a
-    7:7:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1273:1273 -> a
-    7:7:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1315 -> a
-    8:12:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1318:1322 -> a
-    13:13:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    13:13:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    13:13:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1288 -> a
-    13:13:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1322 -> a
-    14:14:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    14:14:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1288 -> a
-    14:14:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1322 -> a
-    15:16:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1289:1290 -> a
-    15:16:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1322 -> a
-    17:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1322:1330 -> a
-    26:26:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    26:26:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    26:26:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1330 -> a
-    27:27:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    27:27:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1330 -> a
-    28:45:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1330:1347 -> a
-    46:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1344:1344 -> a
-    47:47:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1341:1341 -> a
-    48:48:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1338:1338 -> a
-    49:49:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1335:1335 -> a
-    50:50:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1332:1332 -> a
-    51:51:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    51:51:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    51:51:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    51:51:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1351 -> a
-    52:52:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    52:52:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    52:52:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1351 -> a
-    53:53:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1273:1273 -> a
-    53:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1351 -> a
-    54:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1352:1352 -> a
-    55:55:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    55:55:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    55:55:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1352 -> a
-    56:56:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    56:56:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1352 -> a
-    57:74:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1352:1369 -> a
-    75:75:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1366:1366 -> a
-    76:76:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1363:1363 -> a
-    77:77:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1360:1360 -> a
-    78:78:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1357:1357 -> a
-    79:79:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1354:1354 -> a
-    80:80:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1263:1263 -> a
-    80:80:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1373 -> a
-    81:82:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1373:1374 -> a
-    83:83:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    83:83:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    83:83:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1294 -> a
-    83:83:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1379 -> a
-    84:84:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    84:84:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1294 -> a
-    84:84:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1379 -> a
-    85:85:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1294:1294 -> a
-    85:85:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1379 -> a
-    86:86:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getMaxOffset():1263:1263 -> a
-    86:86:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1295 -> a
-    86:86:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1379 -> a
-    87:89:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1296:1298 -> a
-    87:89:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1379 -> a
-    90:90:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1263:1263 -> a
-    90:90:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1298 -> a
-    90:90:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1379 -> a
-    91:91:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1299:1299 -> a
-    91:91:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1379 -> a
-    92:92:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1263:1263 -> a
-    92:92:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1305 -> a
-    92:92:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1379 -> a
-    93:93:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1263:1263 -> a
-    93:93:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1306 -> a
-    93:93:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1379 -> a
-    94:94:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    94:94:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    94:94:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1380 -> a
-    95:95:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    95:95:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1380 -> a
-    96:96:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1380:1380 -> a
-    97:97:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    97:97:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    97:97:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1288 -> a
-    97:97:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1382 -> a
-    98:98:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    98:98:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1288 -> a
-    98:98:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1382 -> a
-    99:100:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1289:1290 -> a
-    99:100:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1382 -> a
-    101:101:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1382:1382 -> a
-    102:105:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1403:1406 -> a
-    106:106:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    106:106:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    106:106:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1407 -> a
-    107:107:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    107:107:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1407 -> a
-    108:108:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1407:1407 -> a
-    109:109:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    109:109:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    109:109:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1407 -> a
+    1:1:void <clinit>():1292:1292 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.If):1297:1297 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.If):1294:1294 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    1:1:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1340 -> a
+    2:2:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1340 -> a
+    3:4:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1341:1342 -> a
+    5:5:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    5:5:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    5:5:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    5:5:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1344 -> a
+    6:6:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    6:6:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    6:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1344 -> a
+    7:7:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1302:1302 -> a
+    7:7:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1344 -> a
+    8:12:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1347:1351 -> a
+    13:13:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    13:13:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    13:13:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1317 -> a
+    13:13:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1351 -> a
+    14:14:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    14:14:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1317 -> a
+    14:14:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1351 -> a
+    15:16:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1318:1319 -> a
+    15:16:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1351 -> a
+    17:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1351:1359 -> a
+    26:26:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    26:26:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    26:26:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1359 -> a
+    27:27:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    27:27:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1359 -> a
+    28:45:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1359:1376 -> a
+    46:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1373:1373 -> a
+    47:47:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1370:1370 -> a
+    48:48:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1367:1367 -> a
+    49:49:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1364:1364 -> a
+    50:50:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1361:1361 -> a
+    51:51:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    51:51:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    51:51:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    51:51:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1380 -> a
+    52:52:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    52:52:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    52:52:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1380 -> a
+    53:53:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1302:1302 -> a
+    53:53:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1380 -> a
+    54:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1381:1381 -> a
+    55:55:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    55:55:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    55:55:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1381 -> a
+    56:56:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    56:56:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1381 -> a
+    57:74:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1381:1398 -> a
+    75:75:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1395:1395 -> a
+    76:76:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1392:1392 -> a
+    77:77:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1389:1389 -> a
+    78:78:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1386:1386 -> a
+    79:79:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1383:1383 -> a
+    80:80:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1292:1292 -> a
+    80:80:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1402 -> a
+    81:82:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1402:1403 -> a
+    83:83:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    83:83:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    83:83:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1323 -> a
+    83:83:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
+    84:84:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    84:84:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1323 -> a
+    84:84:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
+    85:85:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1323:1323 -> a
+    85:85:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
+    86:86:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getMaxOffset():1292:1292 -> a
+    86:86:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1324 -> a
+    86:86:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
+    87:89:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1325:1327 -> a
+    87:89:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
+    90:90:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1292:1292 -> a
+    90:90:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1327 -> a
+    90:90:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
+    91:91:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1328:1328 -> a
+    91:91:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
+    92:92:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1292:1292 -> a
+    92:92:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1334 -> a
+    92:92:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
+    93:93:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1292:1292 -> a
+    93:93:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1335 -> a
+    93:93:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
+    94:94:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    94:94:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    94:94:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1409 -> a
+    95:95:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    95:95:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1409 -> a
+    96:96:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1409:1409 -> a
+    97:97:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    97:97:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    97:97:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1317 -> a
+    97:97:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1411 -> a
+    98:98:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    98:98:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1317 -> a
+    98:98:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1411 -> a
+    99:100:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1318:1319 -> a
+    99:100:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1411 -> a
+    101:101:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1411:1411 -> a
+    102:105:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1432:1435 -> a
+    106:106:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    106:106:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    106:106:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1436 -> a
+    107:107:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    107:107:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1436 -> a
+    108:108:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1436:1436 -> a
+    109:109:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    109:109:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    109:109:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1436 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    110:110:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    110:110:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1407 -> a
-    111:111:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1407:1407 -> a
-    112:112:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    112:112:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    112:112:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1277 -> a
-    112:112:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    113:113:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    113:113:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1277 -> a
-    113:113:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    114:115:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1277:1278 -> a
-    114:115:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    116:116:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    116:116:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    116:116:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    116:116:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1278 -> a
-    116:116:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    117:117:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    117:117:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    117:117:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1278 -> a
-    117:117:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    118:118:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1273:1273 -> a
-    118:118:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1278 -> a
-    118:118:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    119:121:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1278:1280 -> a
-    119:121:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    122:122:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    122:122:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    122:122:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    122:122:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    122:122:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    123:123:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    123:123:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    123:123:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    123:123:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    124:124:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1273:1273 -> a
-    124:124:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    124:124:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    125:125:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280:1280 -> a
-    125:125:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    126:126:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    126:126:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    126:126:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    126:126:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    126:126:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    127:127:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    127:127:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    127:127:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    127:127:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    128:128:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1273:1273 -> a
-    128:128:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    128:128:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    129:129:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280:1280 -> a
-    129:129:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    130:130:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    130:130:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    130:130:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1277 -> a
-    130:130:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    131:131:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    131:131:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1277 -> a
-    131:131:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    132:133:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1277:1278 -> a
-    132:133:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    134:134:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    134:134:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    134:134:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    134:134:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1278 -> a
-    134:134:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    135:135:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    135:135:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    135:135:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1278 -> a
-    135:135:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    136:136:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1273:1273 -> a
-    136:136:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1278 -> a
-    136:136:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    137:139:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1278:1280 -> a
-    137:139:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    140:140:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    140:140:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    140:140:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    140:140:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    140:140:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    141:141:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    141:141:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    141:141:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    141:141:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    142:142:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1273:1273 -> a
-    142:142:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    142:142:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    143:143:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280:1280 -> a
-    143:143:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    144:144:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1263:1263 -> a
-    144:144:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284 -> a
-    144:144:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    144:144:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    144:144:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    145:145:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1284:1284 -> a
-    145:145:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1272 -> a
-    145:145:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    145:145:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    146:146:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1273:1273 -> a
-    146:146:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280 -> a
-    146:146:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    147:147:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1280:1280 -> a
-    147:147:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408 -> a
-    148:148:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1408:1408 -> a
-    1:1:int getSize():1398:1398 -> d
+    110:110:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    110:110:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1436 -> a
+    111:111:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1436:1436 -> a
+    112:112:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    112:112:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    112:112:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1306 -> a
+    112:112:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    113:113:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    113:113:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1306 -> a
+    113:113:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    114:115:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1306:1307 -> a
+    114:115:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    116:116:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    116:116:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    116:116:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    116:116:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    116:116:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    117:117:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    117:117:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    117:117:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    117:117:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    118:118:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1302:1302 -> a
+    118:118:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    118:118:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    119:121:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1307:1309 -> a
+    119:121:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    122:122:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    122:122:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    122:122:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    122:122:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    122:122:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    123:123:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    123:123:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    123:123:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    123:123:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    124:124:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1302:1302 -> a
+    124:124:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    124:124:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    125:125:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309:1309 -> a
+    125:125:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    126:126:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    126:126:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    126:126:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    126:126:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    126:126:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    127:127:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    127:127:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    127:127:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    127:127:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    128:128:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1302:1302 -> a
+    128:128:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    128:128:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    129:129:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309:1309 -> a
+    129:129:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    130:130:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    130:130:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    130:130:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1306 -> a
+    130:130:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    131:131:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    131:131:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1306 -> a
+    131:131:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    132:133:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1306:1307 -> a
+    132:133:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    134:134:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    134:134:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    134:134:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    134:134:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    134:134:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    135:135:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    135:135:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    135:135:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    135:135:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    136:136:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1302:1302 -> a
+    136:136:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1307 -> a
+    136:136:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    137:139:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1307:1309 -> a
+    137:139:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    140:140:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    140:140:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    140:140:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    140:140:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    140:140:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    141:141:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    141:141:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    141:141:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    141:141:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    142:142:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1302:1302 -> a
+    142:142:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    142:142:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    143:143:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309:1309 -> a
+    143:143:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    144:144:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1292:1292 -> a
+    144:144:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313 -> a
+    144:144:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    144:144:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    144:144:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    145:145:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1313:1313 -> a
+    145:145:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1301 -> a
+    145:145:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    145:145:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    146:146:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1302:1302 -> a
+    146:146:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309 -> a
+    146:146:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    147:147:int[] com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1309:1309 -> a
+    147:147:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437 -> a
+    148:148:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1437:1437 -> a
+    1:1:int getSize():1427:1427 -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.Mg:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.Qg:
     com.android.tools.r8.ir.code.Instruction ir -> a
     int offset -> b
     int maxOffset -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():935:935 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):944:944 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):939:946 -> <init>
+    1:1:void <clinit>():964:964 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):973:973 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):968:975 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
     boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:2:void setMaxOffset(int):991:992 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction getIR():996:996 -> a
-    1:1:void setMinOffset(int):981:981 -> b
-    2:3:int getMaxOffset():986:987 -> b
-    1:2:int getOffset():966:967 -> c
-    3:4:void setOffset(int):971:972 -> c
+    1:2:void setMaxOffset(int):1020:1021 -> a
+    3:3:com.android.tools.r8.ir.code.Instruction getIR():1025:1025 -> a
+    1:1:void setMinOffset(int):1010:1010 -> b
+    2:3:int getMaxOffset():1015:1016 -> b
+    1:2:int getOffset():995:996 -> c
+    3:4:void setOffset(int):1000:1001 -> c
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.Ng:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.Rg:
     boolean $assertionsDisabled -> f
     int size -> e
-    1:1:void <clinit>():1412:1412 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Move):1417:1417 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Move):1414:1414 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1412:1412 -> a
-    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1421 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1460 -> a
-    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1421:1421 -> a
-    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1460 -> a
-    3:42:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1461:1500 -> a
+    1:1:void <clinit>():1441:1441 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Move):1446:1446 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Move):1443:1443 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1441:1441 -> a
+    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1450 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1489 -> a
+    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1450:1450 -> a
+    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1489 -> a
+    3:42:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1490:1529 -> a
     43:43:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6064,"2":6065,"3":6066}}
-    6064:6064:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1500:1500 -> a
-    6065:6065:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1500:1500 -> a
-    6066:6066:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1500:1500 -> a
-    1543:1547:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1500:1504 -> a
-    1548:1548:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6070,"2":6071,"3":6072}}
-    6070:6070:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1504:1504 -> a
-    6071:6071:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1504:1504 -> a
-    6072:6072:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1504:1504 -> a
-    3052:3052:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1504:1504 -> a
-    3053:3060:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1482:1489 -> a
-    3061:3061:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6073,"2":6074,"3":6075}}
-    6073:6073:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1489:1489 -> a
-    6074:6074:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1489:1489 -> a
-    6075:6075:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1489:1489 -> a
-    4550:4550:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1489:1489 -> a
-    4551:4559:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1468:1476 -> a
-    4560:4560:int com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getOffset():1412:1412 -> a
-    4560:4560:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1506 -> a
-    4561:4562:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1506:1507 -> a
-    4563:4563:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1478:1478 -> a
-    4564:4564:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6076,"2":6077,"3":6078}}
-    6076:6076:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1478:1478 -> a
-    6077:6077:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1478:1478 -> a
-    6078:6078:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1478:1478 -> a
-    6042:6042:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1478:1478 -> a
-    6079:6084:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1434:1439 -> a
-    6085:6096:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1444:1455 -> a
-    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1412:1412 -> b
-    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1421 -> b
-    1:1:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1429 -> b
-    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1421:1421 -> b
-    2:2:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1429 -> b
-    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1429:1429 -> b
-    4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1412:1412 -> b
-    4:4:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1421 -> b
-    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1429 -> b
-    5:5:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1421:1421 -> b
-    5:5:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1429 -> b
-    6:6:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1429:1429 -> b
-    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1412:1412 -> c
-    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1421 -> c
-    1:1:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1425 -> c
-    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1421:1421 -> c
-    2:2:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1425 -> c
-    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1425:1425 -> c
-    4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1412:1412 -> c
-    4:4:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1421 -> c
-    4:4:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1425 -> c
-    5:5:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1421:1421 -> c
-    5:5:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1425 -> c
-    6:6:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1425:1425 -> c
-    1:2:int getSize():1524:1525 -> d
-    1:1:int maxSize():1518:1518 -> e
-    1:1:int minSize():1512:1512 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.Og:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6180,"2":6181,"3":6182}}
+    6180:6180:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1529:1529 -> a
+    6181:6181:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1529:1529 -> a
+    6182:6182:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1529:1529 -> a
+    1572:1576:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1529:1533 -> a
+    1577:1577:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6186,"2":6187,"3":6188}}
+    6186:6186:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1533:1533 -> a
+    6187:6187:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1533:1533 -> a
+    6188:6188:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1533:1533 -> a
+    3110:3110:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1533:1533 -> a
+    3111:3118:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1511:1518 -> a
+    3119:3119:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6189,"2":6190,"3":6191}}
+    6189:6189:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1518:1518 -> a
+    6190:6190:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1518:1518 -> a
+    6191:6191:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1518:1518 -> a
+    4637:4637:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1518:1518 -> a
+    4638:4646:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1497:1505 -> a
+    4647:4647:int com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getOffset():1441:1441 -> a
+    4647:4647:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1535 -> a
+    4648:4649:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1535:1536 -> a
+    4650:4650:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1507:1507 -> a
+    4651:4651:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":6192,"2":6193,"3":6194}}
+    6192:6192:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1507:1507 -> a
+    6193:6193:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1507:1507 -> a
+    6194:6194:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1507:1507 -> a
+    6158:6158:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1507:1507 -> a
+    6195:6200:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1463:1468 -> a
+    6201:6212:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1473:1484 -> a
+    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1441:1441 -> b
+    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1450 -> b
+    1:1:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1458 -> b
+    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1450:1450 -> b
+    2:2:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1458 -> b
+    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1458:1458 -> b
+    4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1441:1441 -> b
+    4:4:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1450 -> b
+    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1458 -> b
+    5:5:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1450:1450 -> b
+    5:5:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1458 -> b
+    6:6:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1458:1458 -> b
+    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1441:1441 -> c
+    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1450 -> c
+    1:1:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1454 -> c
+    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1450:1450 -> c
+    2:2:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1454 -> c
+    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1454:1454 -> c
+    4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1441:1441 -> c
+    4:4:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1450 -> c
+    4:4:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1454 -> c
+    5:5:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1450:1450 -> c
+    5:5:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1454 -> c
+    6:6:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1454:1454 -> c
+    1:2:int getSize():1553:1554 -> d
+    1:1:int maxSize():1547:1547 -> e
+    1:1:int minSize():1541:1541 -> f
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.Sg:
     int size -> f
     com.android.tools.r8.dex.code.DexInstruction[] instructions -> e
-    1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction[]):1051:1057 -> <init>
-    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1062:1062 -> a
-    2:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1067:1071 -> a
-    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1092:1093 -> a
-    1:1:int getSize():1087:1087 -> d
-    1:1:int maxSize():1082:1082 -> e
-    1:1:int minSize():1077:1077 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.Pg:
+    1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.dex.code.DexInstruction[]):1080:1086 -> <init>
+    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1091:1091 -> a
+    2:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1096:1100 -> a
+    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1121:1122 -> a
+    1:1:int getSize():1116:1116 -> d
+    1:1:int maxSize():1111:1111 -> e
+    1:1:int minSize():1106:1106 -> f
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.Tg:
     com.android.tools.r8.ir.code.IntSwitch ir -> a
     com.android.tools.r8.dex.code.DexFormat31t dex -> b
-    1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.dex.code.DexFormat31t):1565:1567 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.Qg:
+    1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.dex.code.DexFormat31t):1594:1596 -> <init>
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.Ug:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> b
     int end -> d
     int start -> c
-    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1548:1551 -> <init>
-    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1556:1556 -> a
-    1:1:int compareTo(java.lang.Object):1542:1542 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.Ih:
+    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1577:1580 -> <init>
+    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1585:1585 -> a
+    1:1:int compareTo(java.lang.Object):1571:1571 -> compareTo
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.Mh:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.ir.code.Position currentPosition -> j
     com.android.tools.r8.graph.DexMethod originalMethod -> m
@@ -54514,7 +54652,7 @@
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():204:204 -> e
     1:4:int getMoveExceptionRegister(int):186:189 -> f
     1:1:int instructionOffset(int):281:281 -> g
-com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.Zj:
+com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.ek:
     long value -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -54524,12 +54662,12 @@
     4:4:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):34:34 -> a
     1:5:boolean equals(java.lang.Object):39:43 -> equals
     1:1:int hashCode():48:48 -> hashCode
-com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.ak:
+com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.fk:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory) -> a
     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.bk:
+com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.gk:
     com.android.tools.r8.graph.DexType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -54539,11 +54677,11 @@
     14:14:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):51:51 -> a
     15:15:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):56:56 -> a
     1:1:boolean equals(java.lang.Object):61:61 -> equals
-com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Ek:
+com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Jk:
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
     void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.DynamicType) -> 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.co:
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.ho:
     java.util.Queue ssaWorklist -> f
     int currentInstructionOffset -> j
     com.android.tools.r8.ir.code.Value previousLocalValue -> w
@@ -54717,7 +54855,7 @@
     271:271:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):669 -> a
     272:278:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():777:783 -> a
     272:278:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):672 -> a
-    279:279:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():38:38 -> a
+    279:279:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():37:37 -> a
     279:279:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():784 -> a
     279:279:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):672 -> a
     280:280:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():785:785 -> a
@@ -54737,13 +54875,13 @@
     290:290:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):672 -> a
     291:293:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():797:799 -> a
     291:293:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):672 -> a
-    294:294:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
+    294:294:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():37:37 -> a
     294:294:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():800 -> a
     294:294:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):672 -> a
-    295:295:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
+    295:295:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):37:37 -> a
     295:295:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():801 -> a
     295:295:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):672 -> a
-    296:296:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():38:38 -> a
+    296:296:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():37:37 -> a
     296:296:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():802 -> a
     296:296:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):672 -> a
     297:298:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):675:676 -> a
@@ -54753,10 +54891,10 @@
     300:300:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1660:1660 -> a
     300:300:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):676 -> a
     301:302:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):677:678 -> a
-    303:303:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
+    303:303:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():37:37 -> a
     303:303:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):679 -> a
     304:309:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):680:685 -> a
-    310:310:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
+    310:310:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):37:37 -> a
     310:310:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):686 -> a
     311:312:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):693:694 -> a
     313:343:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2646:2676 -> a
@@ -54874,11 +55012,11 @@
     542:543:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1047:1048 -> a
     544:546:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.readRegisterForDebugLocal(int,com.android.tools.r8.graph.DebugLocalInfo):2135:2137 -> a
     544:546:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1051 -> a
-    547:547:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538:538 -> a
+    547:547:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():539:539 -> a
     547:547:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1024 -> a
     547:547:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1052 -> a
     548:548:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    548:548:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538 -> a
+    548:548:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():539 -> a
     548:548:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1024 -> a
     548:548:void addDebugLocalEnd(int,com.android.tools.r8.graph.DebugLocalInfo):1052 -> a
     549:549:boolean com.android.tools.r8.ir.conversion.IRBuilder.isValidFor(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DebugLocalInfo):1024:1024 -> a
@@ -55136,10 +55274,10 @@
     1218:1218:com.android.tools.r8.graph.DebugLocalInfo com.android.tools.r8.ir.conversion.IRBuilder.getIncomingLocal(int):2351:2351 -> a
     1218:1218:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2112 -> a
     1219:1223:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2113:2117 -> a
-    1224:1224:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538:538 -> a
+    1224:1224:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():539:539 -> a
     1224:1224:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2117 -> a
     1225:1225:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalUninitialized():0:0 -> a
-    1225:1225:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():538 -> a
+    1225:1225:boolean com.android.tools.r8.ir.code.Value.isUninitializedLocal():539 -> a
     1225:1225:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2117 -> a
     1226:1236:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2118:2128 -> a
     1237:1241:com.android.tools.r8.ir.code.Value readRegister(int,com.android.tools.r8.ir.code.ValueTypeConstraint):2126:2130 -> a
@@ -55279,10 +55417,10 @@
     79:83:void addGoto(int):1378:1382 -> b
     84:87:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1484:1487 -> b
     88:88:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1650:1650 -> b
-    89:89:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> b
+    89:89:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> b
     89:89:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1650 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    90:90:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> b
+    90:90:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> b
     90:90:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1650 -> b
     91:97:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1650:1656 -> b
     98:112:void addInvokeRangeNewArray(com.android.tools.r8.graph.DexType,int,int):1695:1709 -> b
@@ -55573,7 +55711,7 @@
     8:8:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.conversion.IRBuilder.writeNumericRegister(int,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):2347:2347 -> v
     8:8:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2094 -> v
     9:12:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2095:2098 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.Xn:
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.co:
     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
@@ -55598,7 +55736,7 @@
     371:371:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntIterator.next():33 -> toString
     371:371:java.lang.String toString():365 -> toString
     372:376:java.lang.String toString():365:369 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.Yn:
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.do:
     com.android.tools.r8.graph.DexType guard -> d
     int targetOffset -> f
     int sourceOffset -> e
@@ -55607,7 +55745,7 @@
     1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):199:199 -> a
     1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):199:199 -> b
     1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):199:199 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.Zn:
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.eo:
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
@@ -55615,13 +55753,13 @@
     1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):214:214 -> a
     1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):214:214 -> b
     1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):214:214 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.ao:
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.fo:
     java.util.List values -> a
     1:3:void <init>():237:239 -> <init>
     1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):245:247 -> a
     1:9:boolean equals(java.lang.Object):259:267 -> equals
     1:1:int hashCode():254:254 -> hashCode
-com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.bo:
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.go:
     int firstInstructionIndex -> b
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.code.BasicBlock block -> a
@@ -55630,13 +55768,14 @@
     2:5:void <init>(com.android.tools.r8.ir.code.BasicBlock,int):192:195 -> <init>
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):187:187 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):187:187 -> b
-com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.internal.oo:
+com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.internal.to:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> A
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> p
     boolean $assertionsDisabled -> P
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> d
     com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> w
+    com.android.tools.r8.ir.optimize.membervaluepropagation.MemberValuePropagation memberValuePropagation -> q
     com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> F
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> I
     com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> D
@@ -55662,7 +55801,6 @@
     java.util.List onWaveDoneActions -> K
     com.android.tools.r8.utils.CfgPrinter printer -> m
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> k
-    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> q
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> H
     com.android.tools.r8.utils.InternalOptions options -> l
     com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> x
@@ -55673,406 +55811,446 @@
     com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> h
     com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> u
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> G
-    1:1:void <clinit>():112:112 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):170:170 -> <init>
-    2:173:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):129:300 -> <init>
-    174:174:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):305:305 -> <init>
+    1:1:void <clinit>():115:115 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):173:173 -> <init>
+    2:177:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):132:307 -> <init>
+    178:178:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):312:312 -> <init>
     1:2:void com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover.run(com.android.tools.r8.graph.AppView):17:18 -> a
-    1:2:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):344 -> a
-    3:16:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):345:358 -> a
-    17:21:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):385:389 -> a
-    17:21:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):360 -> a
-    22:26:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):386:390 -> a
-    22:26:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):360 -> a
-    27:27:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):362:362 -> a
-    28:32:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):385:389 -> a
-    28:32:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):364 -> a
-    33:37:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):386:390 -> a
-    33:37:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):364 -> a
-    38:40:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):367:369 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
-    41:41:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):369 -> a
+    1:2:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):351 -> a
+    3:16:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):352:365 -> a
+    17:21:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):392:396 -> a
+    17:21:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):367 -> a
+    22:26:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):393:397 -> a
+    22:26:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):367 -> a
+    27:27:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):369:369 -> a
+    28:32:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):392:396 -> a
+    28:32:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):371 -> a
+    33:37:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):393:397 -> a
+    33:37:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):371 -> a
+    38:40:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):374:376 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
+    41:41:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):376 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    42:42:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
-    42:42:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):369 -> a
-    43:43:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):370:370 -> a
-    44:45:void com.android.tools.r8.ir.conversion.IRConverter.processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):337:338 -> a
-    44:45:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):372 -> a
-    46:52:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):374:380 -> a
-    53:53:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):377:377 -> a
-    54:54:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):190:190 -> a
+    42:42:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
+    42:42:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):376 -> a
+    43:43:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):377:377 -> a
+    44:45:void com.android.tools.r8.ir.conversion.IRConverter.processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):344:345 -> a
+    44:45:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):379 -> a
+    46:52:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):381:387 -> a
+    53:53:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):384:384 -> a
+    54:54:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):193:193 -> a
     55:55:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":248,"2":249,"3":250}}
-    248:248:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):190:190 -> a
-    249:249:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):190:190 -> a
-    250:250:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):190:190 -> a
-    246:246:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):191:191 -> a
-    247:247:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):190:190 -> a
-    251:255:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):319:323 -> a
-    256:256:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$1(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring):321:321 -> a
-    257:257:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):435:435 -> a
-    258:261: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,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):57:60 -> a
-    258:261:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):436 -> a
-    262:272:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):437:447 -> a
-    273:281:void com.android.tools.r8.ir.desugar.lambda.D8LambdaDesugaring.rewriteEnclosingLambdaMethodAttributes(com.android.tools.r8.graph.AppView,java.util.Map):17:25 -> a
-    273:281:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):446 -> a
-    282:282:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):449:449 -> a
-    283:285:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):455:457 -> a
-    286:294:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):456:464 -> a
-    295:295:void lambda$prepareDesugaringForD8$5(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.DexProgramClass):459:459 -> a
-    296:296:boolean lambda$prepareDesugaringForD8$3(com.android.tools.r8.graph.DexEncodedMethod):460:460 -> a
-    297:297:void lambda$prepareDesugaringForD8$4(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):461:461 -> a
-    298:326:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):472:500 -> a
-    327:327:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2121:2121 -> a
-    327:327:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):500 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":251,"2":252,"3":253}}
+    251:251:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):193:193 -> a
+    252:252:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):193:193 -> a
+    253:253:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):193:193 -> a
+    249:249:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):194:194 -> a
+    250:250:com.android.tools.r8.graph.DexString lambda$new$0(java.lang.String):193:193 -> a
+    254:258:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService):326:330 -> a
+    259:259:void lambda$synthesizeBridgesForNestBasedAccessesOnClasspath$1(com.android.tools.r8.ir.conversion.D8MethodProcessor,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring):328:328 -> a
+    260:260:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):442:442 -> a
+    261:264: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,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):57:60 -> a
+    261:264:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):443 -> a
+    265:275:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):444:454 -> a
+    276:284:void com.android.tools.r8.ir.desugar.lambda.D8LambdaDesugaring.rewriteEnclosingLambdaMethodAttributes(com.android.tools.r8.graph.AppView,java.util.Map):17:25 -> a
+    276:284:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):453 -> a
+    285:285:void convertClasses(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):456:456 -> a
+    286:288:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):462:464 -> a
+    289:297:void prepareDesugaringForD8(java.util.concurrent.ExecutorService):463:471 -> a
+    298:298:void lambda$prepareDesugaringForD8$5(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.DexProgramClass):466:466 -> a
+    299:299:boolean lambda$prepareDesugaringForD8$3(com.android.tools.r8.graph.DexEncodedMethod):467:467 -> a
+    300:300:void lambda$prepareDesugaringForD8$4(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):468:468 -> a
+    301:329:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):479:507 -> a
+    330:330:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2101:2101 -> a
+    330:330:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):507 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    331:331:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2125:2125 -> a
-    331:331:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):500 -> a
-    332:332: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
-    332:332:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2126 -> a
-    332:332:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):500 -> a
-    333:333:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):499:499 -> a
-    334:337:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):509:512 -> a
-    338:338:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2121:2121 -> a
-    338:338:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):512 -> a
+    334:334:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2105:2105 -> a
+    334:334:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):507 -> a
+    335:335: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
+    335:335:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2106 -> a
+    335:335:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):507 -> a
+    336:336:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):506:506 -> a
+    337:340:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):516:519 -> a
+    341:341:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2101:2101 -> a
+    341:341:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):519 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    342:342:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2125:2125 -> a
-    342:342:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):512 -> a
-    343:343: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
-    343:343:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2126 -> a
-    343:343:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):512 -> a
-    344:350:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):511:517 -> a
-    351:356:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):552:557 -> a
-    351:356:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    357:357:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    357:357:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):557 -> a
-    357:357:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    358:360:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):558:560 -> a
-    358:360:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    361:361:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    361:361:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):561 -> a
-    361:361:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    362:395:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):562:595 -> a
-    362:395:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    396:414:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):589:607 -> a
-    396:414:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    415:415:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
-    415:415:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):607 -> a
-    415:415:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    416:418:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):615:617 -> a
-    416:418:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    419:431:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):609:621 -> a
-    419:431:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    432:432:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    432:432:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):621 -> a
-    432:432:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    433:433:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    433:433:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    433:433:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):621 -> a
-    433:433:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    434:434:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):621:621 -> a
-    434:434:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):520 -> a
-    435:435:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):521:521 -> a
-    436:436:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    436:436:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):521 -> a
+    345:345:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2105:2105 -> a
+    345:345:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):519 -> a
+    346:346: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
+    346:346:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2106 -> a
+    346:346:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):519 -> a
+    347:353:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):518:524 -> a
+    354:359:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):559:564 -> a
+    354:359:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    360:360:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
+    360:360:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):564 -> a
+    360:360:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    361:363:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):565:567 -> a
+    361:363:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    364:364:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
+    364:364:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):568 -> a
+    364:364:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    365:398:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):569:602 -> a
+    365:398:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    399:417:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):596:614 -> a
+    399:417:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    418:418:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
+    418:418:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):614 -> a
+    418:418:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    419:421:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):622:624 -> a
+    419:421:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    422:434:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):616:628 -> a
+    422:434:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    435:435:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    435:435:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):628 -> a
+    435:435:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    436:436:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    436:436:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    436:436:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):628 -> a
+    436:436:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    437:437:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):628:628 -> a
+    437:437:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):527 -> a
+    438:438:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):528:528 -> a
+    439:439:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    439:439:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):528 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    437:437:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    437:437:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):521 -> a
-    438:448:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):521:531 -> a
-    449:458:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):524:533 -> a
-    459:459:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    459:459:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):533 -> a
+    440:440:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    440:440:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):528 -> a
+    441:451:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):528:538 -> a
+    452:461:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):531:540 -> a
+    462:462:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    462:462:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    460:460:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    460:460:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):533 -> a
-    461:461:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):534:534 -> a
-    462:468:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1679:1685 -> a
-    462:468:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):534 -> a
-    469:469:void lambda$optimize$8(java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):663:663 -> a
-    470:470:com.android.tools.r8.utils.Timing lambda$optimize$9(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.contexts.CompilationContext$MethodProcessingContext):685:685 -> a
-    471:471:void lambda$optimize$10(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):723:723 -> a
-    472:472:com.android.tools.r8.utils.Timing lambda$optimize$11(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PostMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):753:753 -> a
-    473:473:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):819:819 -> a
-    474:480:void lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):849:855 -> a
-    481:481:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
-    481:481:void lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):855 -> a
+    463:463:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    463:463:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540 -> a
+    464:464:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):541:541 -> a
+    465:471:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1688:1694 -> a
+    465:471:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):541 -> a
+    472:472:void lambda$optimize$8(java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):670:670 -> a
+    473:473:com.android.tools.r8.utils.Timing lambda$optimize$9(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.contexts.CompilationContext$MethodProcessingContext):692:692 -> a
+    474:474:void lambda$optimize$10(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):730:730 -> a
+    475:475:com.android.tools.r8.utils.Timing lambda$optimize$11(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PostMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):761:761 -> a
+    476:476:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):827:827 -> a
+    477:483:void lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):857:863 -> a
+    484:484:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
+    484:484:void lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):863 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    482:482:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
-    482:482:void lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):855 -> a
-    483:483:void lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):855:855 -> a
-    484:490:void addWaveDoneAction(com.android.tools.r8.utils.Action):859:865 -> a
-    491:491:void addWaveDoneAction(com.android.tools.r8.utils.Action):863:863 -> a
-    492:492:void addWaveDoneAction(com.android.tools.r8.utils.Action):860:860 -> a
-    493:496:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):880:883 -> a
-    497:497:void clearDexMethodCompilationState():887:887 -> a
-    498:498:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):891:891 -> a
-    499:506:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):903:910 -> a
-    507:515:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):908:916 -> a
-    516:516:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):954:954 -> a
-    516:516:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):917 -> a
-    517:517:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):917:917 -> a
-    518:518:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):913:913 -> a
-    519:520:void optimizeSynthesizedMethods(java.util.List,java.util.concurrent.ExecutorService):925:926 -> a
-    521:521:void lambda$optimizeSynthesizedMethod$12(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):936:936 -> a
-    522:524:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):943:945 -> a
-    525:525:com.android.tools.r8.utils.Timing lambda$rewriteDesugaredCode$15(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.contexts.CompilationContext$MethodProcessingContext):1010:1010 -> a
-    526:531:boolean com.android.tools.r8.ir.conversion.IRConverter.desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1069:1074 -> a
-    526:531:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1020 -> a
-    526:531:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):993 -> a
-    532:537:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1021:1026 -> a
-    532:537:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):993 -> a
-    538:538:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):954:954 -> a
-    538:538:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1026 -> a
-    538:538:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):993 -> a
-    539:539:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1026:1026 -> a
-    539:539:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):993 -> a
-    540:546:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1022:1028 -> a
-    540:546:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):993 -> a
-    547: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.contexts.CompilationContext$MethodProcessingContext):1086:1094 -> a
-    556:561:void com.android.tools.r8.ir.conversion.IRConverter.printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1691:1696 -> 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.contexts.CompilationContext$MethodProcessingContext):1097 -> a
-    562:576: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.contexts.CompilationContext$MethodProcessingContext):1098:1112 -> a
-    577:577:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3728:3728 -> a
-    577: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    578:578:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1067:1067 -> a
-    578:578:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3729 -> a
-    578:578: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    579:581:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3730:3732 -> a
-    579:581: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    582:582:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    582:582:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3732 -> a
-    582:582: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    583:585:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3733:3735 -> a
-    583:585: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    586:586: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):46:46 -> a
-    586:586:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3735 -> a
-    586:586: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    587:588:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3736:3737 -> a
-    587:588: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    589:589:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1495:1495 -> a
-    589:589:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
-    589:589: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    590:590:byte com.android.tools.r8.graph.DexString.byteAt(int):54:54 -> a
-    590:590:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1495 -> a
+    485:485:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
+    485:485:void lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):863 -> a
+    486:486:void lastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):863:863 -> a
+    487:493:void addWaveDoneAction(com.android.tools.r8.utils.Action):867:873 -> a
+    494:494:void addWaveDoneAction(com.android.tools.r8.utils.Action):871:871 -> a
+    495:495:void addWaveDoneAction(com.android.tools.r8.utils.Action):868:868 -> a
+    496:499:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):888:891 -> a
+    500:500:void clearDexMethodCompilationState():895:895 -> a
+    501:501:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):899:899 -> a
+    502:509:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):911:918 -> a
+    510:518:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):916:924 -> a
+    519:519:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):962:962 -> a
+    519:519:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):925 -> a
+    520:520:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):925:925 -> a
+    521:521:void replaceCodeForTesting(com.android.tools.r8.ir.code.IRCode):921:921 -> a
+    522:523:void optimizeSynthesizedMethods(java.util.List,java.util.concurrent.ExecutorService):933:934 -> a
+    524:524:void lambda$optimizeSynthesizedMethod$12(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):944:944 -> a
+    525:527:void processMethodsConcurrently(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):951:953 -> a
+    528:528:com.android.tools.r8.utils.Timing lambda$rewriteDesugaredCode$15(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.contexts.CompilationContext$MethodProcessingContext):1018:1018 -> a
+    529:534:boolean com.android.tools.r8.ir.conversion.IRConverter.desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1077:1082 -> a
+    529:534:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1028 -> a
+    529:534:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1001 -> a
+    535:540:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1029:1034 -> a
+    535:540:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1001 -> a
+    541:541:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):962:962 -> a
+    541:541:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1034 -> a
+    541:541:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1001 -> a
+    542:542:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1034:1034 -> a
+    542:542:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1001 -> a
+    543:549:com.android.tools.r8.utils.Timing com.android.tools.r8.ir.conversion.IRConverter.rewriteNonDesugaredCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1030:1036 -> a
+    543:549:com.android.tools.r8.utils.Timing lambda$rewriteNonDesugaredCode$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1001 -> a
+    550:558: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.contexts.CompilationContext$MethodProcessingContext):1094:1102 -> a
+    559:564:void com.android.tools.r8.ir.conversion.IRConverter.printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1700:1705 -> a
+    559: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.contexts.CompilationContext$MethodProcessingContext):1105 -> a
+    565:579: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.contexts.CompilationContext$MethodProcessingContext):1106:1120 -> a
+    580:580:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3728:3728 -> a
+    580:580: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    581:581:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1067:1067 -> a
+    581:581:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3729 -> a
+    581:581: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    582:584:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3730:3732 -> a
+    582:584: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    585:585:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
+    585:585:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3732 -> a
+    585:585: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    586:588:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3733:3735 -> a
+    586:588: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    589:589: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):46:46 -> a
+    589:589:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3735 -> a
+    589:589: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    590:591:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3736:3737 -> a
+    590:591: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    592:592:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1495:1495 -> a
+    592:592:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
+    592:592: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    593:593:byte com.android.tools.r8.graph.DexString.byteAt(int):58:58 -> a
+    593:593:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1495 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    590:590:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
-    590:590: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    591:591:byte com.android.tools.r8.graph.DexString.byteAt(int):54:54 -> a
-    591:591:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1495 -> a
-    591:591:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
-    591:591: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    592:622:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1502:1532 -> a
-    592:622:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
-    592:622: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    623:647:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1497:1521 -> a
-    623:647:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
-    623:647: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    648:649:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1507:1508 -> a
-    648:649:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
-    648:649: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    650:652:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3740:3742 -> a
-    650:652: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    653:653:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
-    653:653:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3741 -> a
-    653:653: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.contexts.CompilationContext$MethodProcessingContext):1112 -> a
-    654:657: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.contexts.CompilationContext$MethodProcessingContext):1113:1116 -> a
-    658:658:boolean com.android.tools.r8.graph.ProgramMethod.getOrComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):184:184 -> a
-    658:658: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.contexts.CompilationContext$MethodProcessingContext):1116 -> a
-    659:669: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.contexts.CompilationContext$MethodProcessingContext):1119:1129 -> a
-    670:670: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.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4516,"2":4517,"3":4518}}
-    4516:4516: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.contexts.CompilationContext$MethodProcessingContext):1129:1129 -> a
-    4517:4517: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.contexts.CompilationContext$MethodProcessingContext):1129:1129 -> a
-    4518:4518: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.contexts.CompilationContext$MethodProcessingContext):1129:1129 -> a
-    1801:1806: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.contexts.CompilationContext$MethodProcessingContext):1131:1136 -> a
-    1807:1807: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.contexts.CompilationContext$MethodProcessingContext):1134:1134 -> a
-    1808:1808: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.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4523,"2":4524,"3":4525}}
-    4523:4523: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.contexts.CompilationContext$MethodProcessingContext):1134:1134 -> a
-    4524:4524: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.contexts.CompilationContext$MethodProcessingContext):1134:1134 -> a
-    4525:4525: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.contexts.CompilationContext$MethodProcessingContext):1134:1134 -> a
-    2945:2950: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.contexts.CompilationContext$MethodProcessingContext):1137:1142 -> a
-    2951:2951: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.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4533,"2":4534,"3":4535}}
-    4533:4533: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.contexts.CompilationContext$MethodProcessingContext):1142:1142 -> a
-    4534:4534: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.contexts.CompilationContext$MethodProcessingContext):1142:1142 -> a
-    4535:4535: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.contexts.CompilationContext$MethodProcessingContext):1142:1142 -> a
-    4096:4110: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.contexts.CompilationContext$MethodProcessingContext):1145:1159 -> a
-    4111:4115:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1520:1524 -> a
-    4111:4115: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.contexts.CompilationContext$MethodProcessingContext):1161 -> a
-    4116:4116:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
-    4116:4116:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1524 -> a
-    4116:4116: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.contexts.CompilationContext$MethodProcessingContext):1161 -> a
-    4117:4118:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1524:1525 -> a
-    4117:4118: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.contexts.CompilationContext$MethodProcessingContext):1161 -> a
-    4119:4119:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
-    4119:4119:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1525 -> a
-    4119:4119: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.contexts.CompilationContext$MethodProcessingContext):1161 -> a
-    4120:4128: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.contexts.CompilationContext$MethodProcessingContext):1163:1171 -> a
-    4129:4153: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.contexts.CompilationContext$MethodProcessingContext):1165:1189 -> a
-    4154:4154:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):94:94 -> a
-    4154:4154: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.contexts.CompilationContext$MethodProcessingContext):1189 -> a
+    593:593:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
+    593:593: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    594:594:byte com.android.tools.r8.graph.DexString.byteAt(int):58:58 -> a
+    594:594:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1495 -> a
+    594:594:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
+    594:594: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    595:625:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1502:1532 -> a
+    595:625:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
+    595:625: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    626:650:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1497:1521 -> a
+    626:650:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
+    626:650:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    651:652:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory$ObjectMembers.matchingPublicObjectMember(com.android.tools.r8.graph.DexMethod):1507:1508 -> a
+    651:652:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3737 -> a
+    651:652: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    653:655:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3740:3742 -> a
+    653:655: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    656:656:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
+    656:656:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteJdk8272564Fix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):3741 -> a
+    656:656: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.contexts.CompilationContext$MethodProcessingContext):1120 -> a
+    657:660: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.contexts.CompilationContext$MethodProcessingContext):1121:1124 -> a
+    661:661:boolean com.android.tools.r8.graph.ProgramMethod.getOrComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):184:184 -> a
+    661:661: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.contexts.CompilationContext$MethodProcessingContext):1124 -> a
+    662:672: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.contexts.CompilationContext$MethodProcessingContext):1127:1137 -> a
+    673:673:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4565,"2":4566,"3":4567}}
+    4565:4565: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.contexts.CompilationContext$MethodProcessingContext):1137:1137 -> a
+    4566:4566: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.contexts.CompilationContext$MethodProcessingContext):1137:1137 -> a
+    4567:4567: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.contexts.CompilationContext$MethodProcessingContext):1137:1137 -> a
+    1812:1817: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.contexts.CompilationContext$MethodProcessingContext):1139:1144 -> a
+    1818:1818: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.contexts.CompilationContext$MethodProcessingContext):1142:1142 -> a
+    1819:1819: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.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4572,"2":4573,"3":4574}}
+    4572:4572: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.contexts.CompilationContext$MethodProcessingContext):1142:1142 -> a
+    4573:4573: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.contexts.CompilationContext$MethodProcessingContext):1142:1142 -> a
+    4574:4574: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.contexts.CompilationContext$MethodProcessingContext):1142:1142 -> a
+    2964:2969: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.contexts.CompilationContext$MethodProcessingContext):1145:1150 -> a
+    2970:2970: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.contexts.CompilationContext$MethodProcessingContext):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4582,"2":4583,"3":4584}}
+    4582:4582: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.contexts.CompilationContext$MethodProcessingContext):1150:1150 -> a
+    4583:4583: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.contexts.CompilationContext$MethodProcessingContext):1150:1150 -> a
+    4584:4584: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.contexts.CompilationContext$MethodProcessingContext):1150:1150 -> a
+    4123:4137: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.contexts.CompilationContext$MethodProcessingContext):1153:1167 -> a
+    4138:4142:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1529:1533 -> a
+    4138:4142: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.contexts.CompilationContext$MethodProcessingContext):1169 -> a
+    4143:4143:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> a
+    4143:4143:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1533 -> a
+    4143:4143: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.contexts.CompilationContext$MethodProcessingContext):1169 -> a
+    4144:4145:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1533:1534 -> a
+    4144:4145: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.contexts.CompilationContext$MethodProcessingContext):1169 -> a
+    4146:4146:boolean com.android.tools.r8.graph.Code.isDefaultInstanceInitializerCode():0:0 -> a
+    4146:4146:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldPassThrough(com.android.tools.r8.graph.ProgramMethod):1534 -> a
+    4146:4146: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.contexts.CompilationContext$MethodProcessingContext):1169 -> a
+    4147:4155: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.contexts.CompilationContext$MethodProcessingContext):1171:1179 -> a
+    4156:4170: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.contexts.CompilationContext$MethodProcessingContext):1173:1187 -> a
+    4171:4172:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.runIfNecessary(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):22:23 -> a
+    4171:4172: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.contexts.CompilationContext$MethodProcessingContext):1187 -> a
+    4173:4180:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:42 -> a
+    4173:4180:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.runIfNecessary(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):23 -> a
+    4173:4180: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.contexts.CompilationContext$MethodProcessingContext):1187 -> a
+    4181:4183:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.rewriteInvoke(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):53:55 -> a
+    4181:4183:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42 -> a
+    4181:4183:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.runIfNecessary(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):23 -> a
+    4181:4183: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.contexts.CompilationContext$MethodProcessingContext):1187 -> a
+    4184:4184:int com.android.tools.r8.ir.code.InvokeMethod.getFirstNonReceiverArgumentIndex():81:81 -> a
+    4184:4184:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InvokeMethod.getFirstNonReceiverArgument():77 -> a
+    4184:4184:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.rewriteInvoke(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):58 -> a
+    4184:4184:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42 -> a
+    4184:4184:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.runIfNecessary(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):23 -> a
+    4184:4184: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.contexts.CompilationContext$MethodProcessingContext):1187 -> a
+    4185:4185:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.InvokeMethod.getFirstNonReceiverArgument():77:77 -> a
+    4185:4185:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.rewriteInvoke(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):58 -> a
+    4185:4185:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42 -> a
+    4185:4185:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.runIfNecessary(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):23 -> a
+    4185:4185: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.contexts.CompilationContext$MethodProcessingContext):1187 -> a
+    4186:4192:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.rewriteInvoke(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):59:65 -> a
+    4186:4192:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42 -> a
+    4186:4192:void com.android.tools.r8.ir.optimize.CheckNotNullConverter.runIfNecessary(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):23 -> a
+    4186:4192: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.contexts.CompilationContext$MethodProcessingContext):1187 -> a
+    4193:4202: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.contexts.CompilationContext$MethodProcessingContext):1189:1198 -> a
+    4203:4203:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):94:94 -> a
+    4203:4203: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.contexts.CompilationContext$MethodProcessingContext):1198 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4155:4181: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.contexts.CompilationContext$MethodProcessingContext):1190:1216 -> a
-    4182:4182:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
-    4182:4182: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.contexts.CompilationContext$MethodProcessingContext):1216 -> a
-    4183:4183: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.contexts.CompilationContext$MethodProcessingContext):1216:1216 -> a
-    4184:4184:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
-    4184:4184: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.contexts.CompilationContext$MethodProcessingContext):1216 -> a
+    4204:4230: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.contexts.CompilationContext$MethodProcessingContext):1199:1225 -> a
+    4231:4231:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
+    4231:4231: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.contexts.CompilationContext$MethodProcessingContext):1225 -> a
+    4232:4232: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.contexts.CompilationContext$MethodProcessingContext):1225:1225 -> a
+    4233:4233:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
+    4233:4233: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.contexts.CompilationContext$MethodProcessingContext):1225 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4185:4185:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
-    4185:4185: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.contexts.CompilationContext$MethodProcessingContext):1216 -> a
-    4186:4190: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.contexts.CompilationContext$MethodProcessingContext):1217:1217 -> a
-    4196:4214: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.contexts.CompilationContext$MethodProcessingContext):1223:1241 -> a
-    4215:4215: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):875:875 -> a
-    4215:4215: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.contexts.CompilationContext$MethodProcessingContext):1241 -> a
+    4234:4234:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
+    4234:4234: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.contexts.CompilationContext$MethodProcessingContext):1225 -> a
+    4235:4239: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.contexts.CompilationContext$MethodProcessingContext):1226:1226 -> a
+    4245:4263: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.contexts.CompilationContext$MethodProcessingContext):1232:1250 -> a
+    4264:4264: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):876:876 -> a
+    4264:4264: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.contexts.CompilationContext$MethodProcessingContext):1250 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4216:4216: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):869:869 -> a
-    4216:4216: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.contexts.CompilationContext$MethodProcessingContext):1241 -> a
-    4217:4325: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.contexts.CompilationContext$MethodProcessingContext):1242:1350 -> a
-    4326:4329:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):95:98 -> a
-    4326:4329: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.contexts.CompilationContext$MethodProcessingContext):1350 -> a
-    4330:4335: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.contexts.CompilationContext$MethodProcessingContext):1351:1356 -> a
-    4336:4338:void com.android.tools.r8.ir.conversion.IRConverter.invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):976:978 -> a
-    4336:4338: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.contexts.CompilationContext$MethodProcessingContext):1357 -> a
-    4339:4353: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.contexts.CompilationContext$MethodProcessingContext):1361:1375 -> a
-    4354:4379: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.contexts.CompilationContext$MethodProcessingContext):1374:1399 -> a
-    4380:4427: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.contexts.CompilationContext$MethodProcessingContext):1394:1441 -> a
-    4428:4428:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    4428:4428: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.contexts.CompilationContext$MethodProcessingContext):1441 -> a
+    4265:4265: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):870:870 -> a
+    4265:4265: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.contexts.CompilationContext$MethodProcessingContext):1250 -> a
+    4266:4374: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.contexts.CompilationContext$MethodProcessingContext):1251:1359 -> a
+    4375:4378:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):95:98 -> a
+    4375:4378: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.contexts.CompilationContext$MethodProcessingContext):1359 -> a
+    4379:4384: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.contexts.CompilationContext$MethodProcessingContext):1360:1365 -> a
+    4385:4387:void com.android.tools.r8.ir.conversion.IRConverter.invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):984:986 -> a
+    4385:4387: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.contexts.CompilationContext$MethodProcessingContext):1366 -> a
+    4388:4402: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.contexts.CompilationContext$MethodProcessingContext):1370:1384 -> a
+    4403:4428: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.contexts.CompilationContext$MethodProcessingContext):1383:1408 -> a
+    4429:4476: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.contexts.CompilationContext$MethodProcessingContext):1403:1450 -> a
+    4477:4477:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    4477:4477: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.contexts.CompilationContext$MethodProcessingContext):1450 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4429:4429:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    4429:4429: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.contexts.CompilationContext$MethodProcessingContext):1441 -> a
-    4430:4452: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.contexts.CompilationContext$MethodProcessingContext):1442:1464 -> a
-    4453:4453:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1277:1277 -> a
-    4453:4453: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.contexts.CompilationContext$MethodProcessingContext):1464 -> a
+    4478:4478:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    4478:4478: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.contexts.CompilationContext$MethodProcessingContext):1450 -> a
+    4479:4501: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.contexts.CompilationContext$MethodProcessingContext):1451:1473 -> a
+    4502:4502:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1253:1253 -> a
+    4502:4502: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.contexts.CompilationContext$MethodProcessingContext):1473 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4454:4459:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1277:1282 -> a
-    4454:4459: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.contexts.CompilationContext$MethodProcessingContext):1464 -> a
-    4460:4509: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.contexts.CompilationContext$MethodProcessingContext):1464:1513 -> a
-    4510:4515: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.contexts.CompilationContext$MethodProcessingContext):1510:1515 -> a
-    4536:4536: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):1230:1230 -> a
-    4537:4537:void lambda$optimize$17(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1234:1234 -> a
-    4538:4539:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$18(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1407:1408 -> a
-    4540:4540:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int):916:916 -> a
-    4540:4540:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$18(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1407 -> a
+    4503:4508:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1253:1258 -> a
+    4503:4508: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.contexts.CompilationContext$MethodProcessingContext):1473 -> a
+    4509:4558: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.contexts.CompilationContext$MethodProcessingContext):1473:1522 -> a
+    4559:4564: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.contexts.CompilationContext$MethodProcessingContext):1519:1524 -> a
+    4585:4585: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):1239:1239 -> a
+    4586:4586:void lambda$optimize$17(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1243:1243 -> a
+    4587:4588:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$18(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1416:1417 -> a
+    4589:4589:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int):917:917 -> a
+    4589:4589:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$18(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1416 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4541:4541:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int):912:912 -> a
-    4541:4541:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$18(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1407 -> a
-    4542:4587: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1538:1583 -> a
-    4588:4588:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1719:1719 -> a
-    4588:4588: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1583 -> a
+    4590:4590:com.android.tools.r8.ir.optimize.DefaultInliningOracle com.android.tools.r8.ir.optimize.Inliner.createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int):913:913 -> a
+    4590:4590:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$18(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1416 -> a
+    4591:4636: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1547:1592 -> a
+    4637:4637:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1695:1695 -> a
+    4637:4637: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1592 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4589:4594: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1584:1589 -> a
-    4595:4595:void lambda$collectOptimizationInfo$19(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1539:1539 -> a
-    4596:4603:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1601:1608 -> a
-    4604:4604:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1605:1605 -> a
-    4605:4605:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1617:1617 -> a
-    4606:4606:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    4606:4606:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1617 -> a
+    4638:4643: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.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1593:1598 -> a
+    4644:4644:void lambda$collectOptimizationInfo$19(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1548:1548 -> a
+    4645:4652:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1610:1617 -> a
+    4653:4653:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1614:1614 -> a
+    4654:4654:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1626:1626 -> a
+    4655:4655:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    4655:4655:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1626 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4607:4607:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    4607:4607:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1617 -> a
-    4608:4609:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1630:1631 -> a
-    4608:4609:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1618 -> a
-    4610:4611:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.IRToCfFinalizer.finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):24:25 -> a
-    4610:4611:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1633 -> a
-    4610:4611:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1618 -> a
-    4612:4612:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1633:1633 -> a
-    4612:4612:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1618 -> a
-    4613:4617:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1631:1635 -> a
-    4613:4617:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1618 -> a
-    4618:4618:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1620:1620 -> a
-    4619:4623:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1643:1647 -> a
-    4619:4623:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1621 -> a
-    4624:4629:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1645:1650 -> a
-    4624:4629:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1621 -> a
-    4630:4636:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1679:1685 -> a
-    4630:4636:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1650 -> a
-    4630:4636:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1621 -> a
-    4637:4637:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1655:1655 -> a
-    4638:4642:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1664:1668 -> a
-    4638:4642:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1657 -> a
-    4643:4643:boolean com.android.tools.r8.graph.ProgramMethod.getOrComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):184:184 -> a
-    4643:4643:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1668 -> a
-    4643:4643:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1657 -> a
-    4644:4645:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1671:1672 -> a
-    4644:4645:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1657 -> a
-    4646:4648:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1658:1660 -> a
-    4649:4649:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1707:1707 -> a
-    4650:4650:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    4650:4650:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1708 -> a
+    4656:4656:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    4656:4656:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1626 -> a
+    4657:4658:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1639:1640 -> a
+    4657:4658:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1627 -> a
+    4659:4660:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.IRToCfFinalizer.finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):24:25 -> a
+    4659:4660:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1642 -> a
+    4659:4660:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1627 -> a
+    4661:4661:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1642:1642 -> a
+    4661:4661:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1627 -> a
+    4662:4666:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1640:1644 -> a
+    4662:4666:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1627 -> a
+    4667:4667:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1629:1629 -> a
+    4668:4672:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1652:1656 -> a
+    4668:4672:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1630 -> a
+    4673:4678:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1654:1659 -> a
+    4673:4678:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1630 -> a
+    4679:4685:void com.android.tools.r8.ir.conversion.IRConverter.updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1688:1694 -> a
+    4679:4685:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1659 -> a
+    4679:4685:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1630 -> a
+    4686:4686:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1664:1664 -> a
+    4687:4691:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1673:1677 -> a
+    4687:4691:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1666 -> a
+    4692:4692:boolean com.android.tools.r8.graph.ProgramMethod.getOrComputeReachabilitySensitive(com.android.tools.r8.graph.AppView):184:184 -> a
+    4692:4692:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1677 -> a
+    4692:4692:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1666 -> a
+    4693:4694:boolean com.android.tools.r8.ir.conversion.IRConverter.shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1680:1681 -> a
+    4693:4694:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1666 -> a
+    4695:4697:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1667:1669 -> a
+    4698:4698:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1716:1716 -> a
+    4699:4699:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    4699:4699:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1717 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4651:4668:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1709:1726 -> a
-    4669:4669:void lambda$onMethodCodePruned$21(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1756:1756 -> a
+    4700:4717:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1718:1735 -> a
+    4718:4718:void lambda$onMethodCodePruned$21(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1765:1765 -> a
     boolean lambda$postProcessingDesugaringForD8$2(com.android.tools.r8.graph.ProgramMethod) -> b
-    1:1:void clearNestAttributes():332:332 -> b
-    2:10:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):417:425 -> b
-    11:14:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):424:427 -> b
-    15:20:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):628:633 -> b
-    21:21:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):632:632 -> b
-    22:23:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$7(com.android.tools.r8.graph.DexProgramClass):635:636 -> b
-    24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):647:647 -> b
+    1:1:void clearNestAttributes():339:339 -> b
+    2:10:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):424:432 -> b
+    11:14:void postProcessingDesugaringForD8(com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor,java.util.concurrent.ExecutorService):431:434 -> b
+    15:20:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):635:640 -> b
+    21:21:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService):639:639 -> b
+    22:23:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$7(com.android.tools.r8.graph.DexProgramClass):642:643 -> b
+    24:24:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):654:654 -> b
     25:25:boolean com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection.isEmpty():0:0 -> b
-    25:25:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):647 -> b
-    26:85:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):647:706 -> b
-    86:90:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):396:400 -> b
-    86:90:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):709 -> b
-    91:91:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):397:397 -> b
-    91:91:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):709 -> b
-    92:149:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):714:771 -> b
-    150:154:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):396:400 -> b
-    150:154:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):775 -> b
-    155:155:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):397:397 -> b
-    155:155:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):775 -> b
-    156:161:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):778:783 -> b
-    162:195:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):782:815 -> b
-    196:200:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):824:828 -> b
-    201:201:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1719:1719 -> b
-    201:201:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):828 -> b
+    25:25:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):654 -> b
+    26:85:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):654:713 -> b
+    86:90:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):403:407 -> b
+    86:90:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):716 -> b
+    91:91:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):404:404 -> b
+    91:91:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):716 -> b
+    92:115:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):721:744 -> b
+    116:119:void com.android.tools.r8.ir.optimize.enums.EnumDataMap.checkEnumsUnboxed(com.android.tools.r8.graph.AppView):33:36 -> b
+    116:119:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):744 -> b
+    120:120:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):50:50 -> b
+    120:120:void com.android.tools.r8.ir.optimize.enums.EnumDataMap.checkEnumsUnboxed(com.android.tools.r8.graph.AppView):37 -> b
+    120:120:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):744 -> b
+    121:125:void com.android.tools.r8.ir.optimize.enums.EnumDataMap.checkEnumsUnboxed(com.android.tools.r8.graph.AppView):38:42 -> b
+    121:125:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):744 -> b
+    126:159:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):746:779 -> b
+    160:164:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):403:407 -> b
+    160:164:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):783 -> b
+    165:165:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):404:404 -> b
+    165:165:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):783 -> b
+    166:171:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):786:791 -> b
+    172:205:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):790:823 -> b
+    206:206:void com.android.tools.r8.ir.optimize.enums.EnumDataMap.checkEnumsUnboxed(com.android.tools.r8.graph.AppView):44:44 -> b
+    206:206:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):744 -> b
+    207:207:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> b
+    207:207:void com.android.tools.r8.ir.optimize.enums.EnumDataMap.checkEnumsUnboxed(com.android.tools.r8.graph.AppView):45 -> b
+    207:207:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):744 -> b
+    208:208:void com.android.tools.r8.ir.optimize.enums.EnumDataMap.checkEnumsUnboxed(com.android.tools.r8.graph.AppView):45:45 -> b
+    208:208:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):744 -> b
+    209:213:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):832:836 -> b
+    214:214:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1695:1695 -> b
+    214:214:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):836 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    202:213:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):829:840 -> b
-    214:220:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):836:842 -> b
-    221:221:void processSynthesizedServiceLoaderMethods(java.util.List,java.util.concurrent.ExecutorService):875:875 -> b
-    222:222:void lambda$processMethodsConcurrently$13(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):947:947 -> b
-    223:232:com.android.tools.r8.utils.Timing processDesugaredMethod(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.contexts.CompilationContext$MethodProcessingContext):963:972 -> b
-    233:234:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):990:991 -> b
-    235:235:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):989:989 -> b
-    236:237:void printPhase(java.lang.String):1701:1702 -> b
-    238:238:void lambda$onMethodPruned$20(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1739:1739 -> b
-    1:1:com.android.tools.r8.ir.optimize.Inliner getInliner():313:313 -> c
-    2:2:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$6(com.android.tools.r8.graph.ProgramMethod):637:637 -> c
-    3:4:com.android.tools.r8.utils.Timing rewriteDesugaredCode(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.contexts.CompilationContext$MethodProcessingContext):1007:1008 -> c
-    5:5:com.android.tools.r8.utils.Timing rewriteDesugaredCode(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.contexts.CompilationContext$MethodProcessingContext):1006:1006 -> c
-    1:1:boolean isInWave():869:869 -> d
-    2:11:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1036:1045 -> d
-    12:12:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):954:954 -> d
-    12:12:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1045 -> d
-    13:13:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1045:1045 -> d
-    14:21:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1041:1048 -> d
-    22:22:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):539:539 -> d
-    22:22:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1051 -> d
+    215:226:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):837:848 -> b
+    227:233:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):844:850 -> b
+    234:234:void processSynthesizedServiceLoaderMethods(java.util.List,java.util.concurrent.ExecutorService):883:883 -> b
+    235:235:void lambda$processMethodsConcurrently$13(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):955:955 -> b
+    236:245:com.android.tools.r8.utils.Timing processDesugaredMethod(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.contexts.CompilationContext$MethodProcessingContext):971:980 -> b
+    246:247:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):998:999 -> b
+    248:248:com.android.tools.r8.utils.Timing rewriteNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):997:997 -> b
+    249:250:void printPhase(java.lang.String):1710:1711 -> b
+    251:251:void lambda$onMethodPruned$20(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator):1748:1748 -> b
+    1:1:com.android.tools.r8.ir.optimize.Inliner getInliner():320:320 -> c
+    2:2:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$6(com.android.tools.r8.graph.ProgramMethod):644:644 -> c
+    3:4:com.android.tools.r8.utils.Timing rewriteDesugaredCode(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.contexts.CompilationContext$MethodProcessingContext):1015:1016 -> c
+    5:5:com.android.tools.r8.utils.Timing rewriteDesugaredCode(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.contexts.CompilationContext$MethodProcessingContext):1014:1014 -> c
+    1:1:boolean isInWave():877:877 -> d
+    2:11:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1044:1053 -> d
+    12:12:java.lang.String com.android.tools.r8.ir.conversion.IRConverter.logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):962:962 -> d
+    12:12:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1053 -> d
+    13:13:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1053:1053 -> d
+    14:21:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1049:1056 -> d
+    22:22:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):546:546 -> d
+    22:22:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1059 -> d
     23:23:boolean com.android.tools.r8.graph.Code.isThrowNullCode():0:0 -> d
-    23:23:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):539 -> d
-    23:23:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1051 -> d
-    24:30:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):542:548 -> d
-    24:30:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1051 -> d
-    31:41:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1051:1061 -> d
-    42:43:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1052:1053 -> d
-    44:51:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1753:1760 -> d
-    1:1:void reportNestDesugarDependencies():327:327 -> e
-    2:10:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1737:1745 -> e
-    1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):930:934 -> f
-com.android.tools.r8.ir.conversion.IRFinalizer -> com.android.tools.r8.internal.po:
+    23:23:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):546 -> d
+    23:23:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1059 -> d
+    24:30:boolean com.android.tools.r8.ir.conversion.IRConverter.needsIRConversion(com.android.tools.r8.graph.ProgramMethod):549:555 -> d
+    24:30:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1059 -> d
+    31:41:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1059:1069 -> d
+    42:43:com.android.tools.r8.utils.Timing rewriteDesugaredCodeInternal(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.contexts.CompilationContext$MethodProcessingContext):1060:1061 -> d
+    44:51:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1762:1769 -> d
+    1:1:void reportNestDesugarDependencies():334:334 -> e
+    2:10:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1746:1754 -> e
+    1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):938:942 -> f
+com.android.tools.r8.ir.conversion.IRFinalizer -> com.android.tools.r8.internal.uo:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.DeadCodeRemover):19:21 -> <init>
     com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing) -> a
-com.android.tools.r8.ir.conversion.IRToCfFinalizer -> com.android.tools.r8.internal.wo:
+com.android.tools.r8.ir.conversion.IRToCfFinalizer -> com.android.tools.r8.internal.Bo:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.DeadCodeRemover):18:18 -> <init>
     1:2:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.IRToCfFinalizer.finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):24:25 -> a
     1:2:com.android.tools.r8.graph.Code finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):15 -> a
-com.android.tools.r8.ir.conversion.IRToDexFinalizer -> com.android.tools.r8.internal.xo:
+com.android.tools.r8.ir.conversion.IRToDexFinalizer -> com.android.tools.r8.internal.Co:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> c
     com.android.tools.r8.utils.InternalOptions options -> d
     boolean $assertionsDisabled -> e
@@ -56092,7 +56270,7 @@
     50:50:com.android.tools.r8.ir.regalloc.RegisterAllocator com.android.tools.r8.ir.conversion.IRToDexFinalizer.performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):75:75 -> b
     50:50:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):49 -> b
     51:51:com.android.tools.r8.graph.DexCode finalizeCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):50:50 -> b
-com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.internal.VC:
+com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.internal.bD:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> c
@@ -56225,7 +56403,7 @@
     2695:2701:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):472:478 -> a
     2702:2702:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):477:477 -> a
     2703:2703:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):474:474 -> a
-    2704:2704:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    2704:2704:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):41:41 -> a
     2704:2704:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):474 -> a
     2705:2707:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):480:482 -> a
     2708:2712:com.android.tools.r8.ir.code.Value lambda$rewritePartialDefault$5(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.analysis.value.SingleNumberValue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.ExtraParameter,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexType):481:485 -> a
@@ -56273,7 +56451,7 @@
     3782:3782:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):853 -> a
     3782:3782:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
     3782:3782:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor):192 -> a
-    3783:3783:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    3783:3783:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):41:41 -> a
     3783:3783:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteRemovedArgument(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Argument,com.android.tools.r8.graph.proto.RemovedArgumentInfo,java.util.Set,java.util.List,java.util.Set):938 -> a
     3783:3783:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewriteArguments(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription,java.util.Set,java.util.Set):853 -> a
     3783:3783:void com.android.tools.r8.ir.conversion.LensCodeRewriter.rewritePartial(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):216 -> a
@@ -56376,7 +56554,7 @@
     12:12:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):673 -> c
     13:17:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):673:677 -> c
     18:23:com.android.tools.r8.ir.code.Instruction lambda$rewritePartialDefault$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):674:679 -> c
-com.android.tools.r8.ir.conversion.LensCodeRewriter$1 -> com.android.tools.r8.internal.SC:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$1 -> com.android.tools.r8.internal.YC:
     com.android.tools.r8.graph.GraphLens val$codeLens -> e
     com.android.tools.r8.ir.code.InvokeMethod val$invoke -> b
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> f
@@ -56385,7 +56563,7 @@
     1:1:void <init>(com.android.tools.r8.ir.conversion.LensCodeRewriter,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):400:400 -> <init>
     1:3:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():408:410 -> a
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():403:403 -> k
-com.android.tools.r8.ir.conversion.LensCodeRewriter$GraphLensInterval -> com.android.tools.r8.internal.TC:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$GraphLensInterval -> com.android.tools.r8.internal.ZC:
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens graphLens -> a
     com.android.tools.r8.graph.DexMethod method -> c
     com.android.tools.r8.graph.GraphLens codeLens -> b
@@ -56393,7 +56571,7 @@
     1:1:com.android.tools.r8.graph.GraphLens getCodeLens():141:141 -> a
     1:1:com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens getGraphLens():137:137 -> b
     1:1:com.android.tools.r8.graph.DexMethod getMethod():145:145 -> c
-com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.internal.UC:
+com.android.tools.r8.ir.conversion.LensCodeRewriter$InstructionReplacer -> com.android.tools.r8.internal.aD:
     com.android.tools.r8.ir.code.Instruction current -> b
     java.util.Set affectedPhis -> d
     com.android.tools.r8.ir.conversion.LensCodeRewriter this$0 -> e
@@ -56413,7 +56591,7 @@
     18:18:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1301 -> a
     19:21:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1301:1303 -> a
     22:22:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.GraphLens):1299:1299 -> a
-com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.WC:
+com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.cD:
     java.util.Map protoFixupCache -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexDefinitionSupplier definitions -> a
@@ -56526,12 +56704,12 @@
     57:60:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.computeNewMethodName(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod,boolean):114:117 -> b
     57:60:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):92 -> b
     61:65:com.android.tools.r8.graph.DexCallSite rewriteCallSiteInternal(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):93:97 -> b
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker -> com.android.tools.r8.internal.cD:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker -> com.android.tools.r8.internal.iD:
     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):26:28 -> <init>
     1:4:boolean isClassLibraryDesugared(com.android.tools.r8.graph.DexProgramClass):32:35 -> a
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer -> com.android.tools.r8.internal.bD:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer -> com.android.tools.r8.internal.hD:
     com.android.tools.r8.graph.DexString jDollarDescriptorPrefix -> a
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexProgramClass clazz -> c
@@ -56555,14 +56733,14 @@
     32:32:void registerClass(com.android.tools.r8.graph.DexProgramClass):71 -> a
     33:37:void registerClass(com.android.tools.r8.graph.DexProgramClass):72:76 -> a
     38:39:void registerType(com.android.tools.r8.graph.DexType):80:81 -> a
-    40:40:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    40:40:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     40:40:void registerType(com.android.tools.r8.graph.DexType):81 -> a
     41:41:void registerType(com.android.tools.r8.graph.DexType):81:81 -> a
     42:42:void registerField(com.android.tools.r8.graph.DexEncodedField):97:97 -> a
     43:44:void com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer.registerField(com.android.tools.r8.graph.DexField):85:86 -> a
     43:44:void registerField(com.android.tools.r8.graph.DexEncodedField):97 -> a
     1:1:void run():53:53 -> b
-com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry -> com.android.tools.r8.internal.aD:
+com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry -> com.android.tools.r8.internal.gD:
     com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer this$0 -> f
     1:2:void <init>(com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):121:122 -> <init>
     1:1:boolean com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry.registerField(com.android.tools.r8.graph.DexField):126:126 -> a
@@ -56583,17 +56761,17 @@
     1:1:boolean com.android.tools.r8.ir.conversion.LibraryDesugaredChecker$IsLibraryDesugaredTracer$IsLibraryDesugaredUseRegistry.registerField(com.android.tools.r8.graph.DexField):126:126 -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):199 -> g
     2:2:boolean registerType(com.android.tools.r8.graph.DexType):135:135 -> g
-    3:3:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> g
+    3:3:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> g
     3:3:boolean registerType(com.android.tools.r8.graph.DexType):135 -> g
     4:4:boolean registerType(com.android.tools.r8.graph.DexType):136:136 -> g
     5:5:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):149:149 -> g
     1:2:boolean registerMethod(com.android.tools.r8.graph.DexMethod):130:131 -> h
     3:3:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> h
     3:3:boolean registerMethod(com.android.tools.r8.graph.DexMethod):131 -> h
-com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.lG:
+com.android.tools.r8.ir.conversion.MethodConversionOptions -> com.android.tools.r8.internal.sG:
     1:1:void <init>():10:10 -> <init>
     boolean isGeneratingClassFiles() -> a
-com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions -> com.android.tools.r8.internal.lG$a:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions -> com.android.tools.r8.internal.sG$a:
     boolean enablePeepholeOptimizations -> a
     boolean enableStringSwitchConversion -> b
     boolean isGeneratingClassFiles -> c
@@ -56607,11 +56785,11 @@
     1:1:boolean isPeepholeOptimizationsEnabled():55:55 -> c
     1:1:boolean isStringSwitchConversionEnabled():60:60 -> d
     1:1:com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions setIsGeneratingClassFiles(boolean):44:44 -> e
-com.android.tools.r8.ir.conversion.MethodConversionOptions$ThrowingMethodConversionOptions -> com.android.tools.r8.internal.mG:
+com.android.tools.r8.ir.conversion.MethodConversionOptions$ThrowingMethodConversionOptions -> com.android.tools.r8.internal.tG:
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):67:67 -> <init>
     1:1:boolean isGeneratingClassFiles():72:72 -> a
     1:1:boolean isPeepholeOptimizationsEnabled():77:77 -> c
-com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.vG:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.CG:
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
     void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue) -> a
@@ -56634,7 +56812,7 @@
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> d
     void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod) -> e
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> f
-com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.FG:
+com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.internal.MG:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod) -> a
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation() -> a
@@ -56642,14 +56820,14 @@
     boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod) -> b
     void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod) -> c
     boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.conversion.MethodProcessorWithWave -> com.android.tools.r8.internal.GG:
+com.android.tools.r8.ir.conversion.MethodProcessorWithWave -> com.android.tools.r8.internal.NG:
     com.android.tools.r8.utils.collections.ProgramMethodSet waveExtension -> b
     com.android.tools.r8.utils.collections.ProgramMethodSet wave -> a
     1:4:void <init>():10:13 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation getCallSiteInformation():17:17 -> a
     1:1:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):22:22 -> b
     1:1:void scheduleDesugaredMethodForProcessing(com.android.tools.r8.graph.ProgramMethod):27:27 -> c
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.CM:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.TM:
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> c
     1:3:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.utils.collections.ProgramMethodSet):23:25 -> <init>
     1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder builder(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):29:29 -> a
@@ -56677,16 +56855,16 @@
     23:27:void forEachWaveWithExtension(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction,java.util.concurrent.ExecutorService):82 -> a
     28:28:void lambda$forEachWaveWithExtension$0(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction,com.android.tools.r8.graph.ProgramMethod):80:80 -> a
     boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder -> com.android.tools.r8.internal.AM:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder -> com.android.tools.r8.internal.RM:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToProcess -> a
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> b
     1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):91:91 -> <init>
     2:6:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):88:92 -> <init>
     1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$Builder add(com.android.tools.r8.graph.ProgramMethod):96:96 -> a
     2:2:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor build():101:101 -> a
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction -> com.android.tools.r8.internal.BM:
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor$MethodAction -> com.android.tools.r8.internal.SM:
     void accept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.internal.kO:
+com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.internal.CO:
     java.util.Deque waves -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.ProgramMethodSet processed -> e
@@ -56705,7 +56883,7 @@
     31:35:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):192 -> a
     36:38:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):193:195 -> a
     1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):60:61 -> d
-com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.internal.jO:
+com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.internal.BO:
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsToReprocessBuilder -> a
     1:3:void <init>(com.android.tools.r8.graph.GraphLens):68:70 -> <init>
     1:1:void add(com.android.tools.r8.graph.ProgramMethod):75:75 -> a
@@ -56730,7 +56908,7 @@
     1:1:void com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder.add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):79:79 -> c
     1:1:void lambda$addAll$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):83 -> c
     1:1:void remove(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):101:101 -> d
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.internal.PO:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.internal.hP:
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation callSiteInformation -> d
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> f
     com.android.tools.r8.graph.AppView appView -> c
@@ -56754,13 +56932,13 @@
     46:48:void forEachMethod(com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):146:148 -> a
     boolean isPrimaryMethodProcessor() -> b
     1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):82:83 -> d
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.MO:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$MethodAction -> com.android.tools.r8.internal.eP:
     com.android.tools.r8.utils.Timing apply(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction -> com.android.tools.r8.internal.NO:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveDoneAction -> com.android.tools.r8.internal.fP:
     void notifyWaveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService) -> a
-com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.internal.OO:
+com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.internal.gP:
     void notifyWaveStart(com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.TX:
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.oY:
     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
@@ -56784,10 +56962,10 @@
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
     int getMoveExceptionRegister(int) -> f
     int instructionOffset(int) -> g
-com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.DZ:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.YZ:
     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$IdToTargetMapping -> com.android.tools.r8.internal.xZ:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.SZ:
     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
@@ -56798,7 +56976,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):647:647 -> a
     1:1:com.android.tools.r8.ir.code.Phi access$100(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):647:647 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap access$300(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):647:647 -> c
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.wZ:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.RZ:
     1:1:void <init>():649:649 -> <init>
     1:1:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping build(com.android.tools.r8.ir.code.BasicBlock):676:676 -> 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):688:688 -> a
@@ -56821,7 +56999,7 @@
     66:80: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):766:780 -> a
     81:81: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):682:682 -> a
     81:81: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):769 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.zZ:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.UZ:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -56835,7 +57013,7 @@
     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,java.util.Set):338:338 -> 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):334 -> 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.yZ:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.TZ:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:1:void <clinit>():198:198 -> <clinit>
@@ -56866,7 +57044,7 @@
     49:49:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):238 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     50:59:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):238:247 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.BZ:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.WZ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap mapping -> c
     com.android.tools.r8.ir.code.Value stringHashValue -> b
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> a
@@ -56877,7 +57055,7 @@
     3:7:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):631:635 -> <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.AZ:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.VZ:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.ir.code.Phi intermediateIdValue -> c
     com.android.tools.r8.ir.code.Value stringValue -> d
@@ -56958,11 +57136,11 @@
     28:30:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():1607:1609 -> 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):430 -> 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):431:431 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.CZ:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.XZ:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():797:797 -> <clinit>
     1:8:com.android.tools.r8.ir.code.BasicBlock fallthroughBlock(com.android.tools.r8.ir.code.JumpInstruction):805:812 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.internal.HZ:
+com.android.tools.r8.ir.conversion.StringSwitchRemover -> com.android.tools.r8.internal.c00:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement stringType -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> b
@@ -56977,7 +57155,7 @@
     21:22:void run(com.android.tools.r8.ir.code.IRCode):79 -> b
     23:23:void run(com.android.tools.r8.ir.code.IRCode):84:84 -> b
     24:44:void run(com.android.tools.r8.ir.code.IRCode):80:100 -> b
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.internal.EZ:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleEqualityBasedStringSwitchRemover -> com.android.tools.r8.internal.ZZ:
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> g
     com.android.tools.r8.ir.code.BasicBlock block -> f
     com.android.tools.r8.ir.conversion.StringSwitchRemover this$0 -> i
@@ -57015,7 +57193,7 @@
     67:67:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):334 -> a
     67:67:void removeStringSwitch():255 -> a
     68:77:void removeStringSwitch():256:265 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.internal.FZ:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.internal.a00:
     com.android.tools.r8.ir.code.BasicBlock idSwitchBlock -> h
     com.android.tools.r8.ir.conversion.StringSwitchRemover this$0 -> l
     boolean $assertionsDisabled -> m
@@ -57099,7 +57277,7 @@
     135:143:com.android.tools.r8.ir.code.IntSwitch com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover.createIdSwitch(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):473:481 -> a
     135:143:void removeStringSwitch():386 -> a
     144:146:void removeStringSwitch():387:389 -> a
-com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.internal.GZ:
+com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.internal.b00:
     java.util.ListIterator blockIterator -> b
     java.util.Set newBlocksWithStrings -> c
     com.android.tools.r8.ir.code.Value stringValue -> e
@@ -57108,7 +57286,7 @@
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set,com.android.tools.r8.ir.conversion.StringSwitchRemover$1):153:153 -> <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):166:171 -> <init>
     void removeStringSwitch() -> a
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.n00:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.I00:
     java.util.Map unresolvedPayload -> a
     java.util.Map payloadToData -> b
     boolean $assertionsDisabled -> c
@@ -57119,13 +57297,13 @@
     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.m00:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.H00:
     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.SyntheticStraightLineSourceCode -> com.android.tools.r8.internal.G00:
+com.android.tools.r8.ir.conversion.SyntheticStraightLineSourceCode -> com.android.tools.r8.internal.b10:
     java.util.List instructionBuilders -> a
     com.android.tools.r8.ir.code.Position position -> b
     1:3:void <init>(java.util.List,com.android.tools.r8.ir.code.Position):21:23 -> <init>
@@ -57151,7 +57329,7 @@
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():76:76 -> e
     1:1:int getMoveExceptionRegister(int):123:123 -> f
     int instructionOffset(int) -> g
-com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.O20:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.k30:
     java.util.Map unificationParents -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRBuilder builder -> b
@@ -57272,7 +57450,7 @@
     184:184:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
     185:200:void com.android.tools.r8.ir.conversion.TypeConstraintResolver.link(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):250:265 -> a
     185:200:void merge(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):190 -> a
-com.android.tools.r8.ir.conversion.callgraph.CallGraph -> com.android.tools.r8.internal.E6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraph -> com.android.tools.r8.internal.G6:
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
     1:1:void <clinit>():39:39 -> <clinit>
@@ -57292,13 +57470,13 @@
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet extractRoots():76:76 -> d
     2:14:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.conversion.callgraph.CallGraph.extractNodes(java.util.function.Predicate,java.util.function.Consumer):80:92 -> d
     2:14:com.android.tools.r8.utils.collections.ProgramMethodSet extractRoots():76 -> d
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBase -> com.android.tools.r8.internal.F6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBase -> com.android.tools.r8.internal.H6:
     java.util.Map nodes -> a
     1:2:void <init>(java.util.Map):16:17 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase getNode(com.android.tools.r8.graph.ProgramMethod):25:25 -> a
     2:2:java.util.Collection getNodes():29:29 -> a
     1:1:boolean isEmpty():21:21 -> b
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilder -> com.android.tools.r8.internal.G6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilder -> com.android.tools.r8.internal.I6:
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):21:21 -> <init>
@@ -57307,7 +57485,7 @@
     3:3:void processClass(com.android.tools.r8.graph.DexProgramClass):30:30 -> a
     4:6:boolean verifyAllMethodsWithCodeExists():46:48 -> a
     1:8:void processMethod(com.android.tools.r8.graph.ProgramMethod):34:41 -> c
-com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilderBase -> com.android.tools.r8.internal.H6:
+com.android.tools.r8.ir.conversion.callgraph.CallGraphBuilderBase -> com.android.tools.r8.internal.J6:
     java.util.Map nodes -> b
     java.util.Map possibleProgramTargetsCache -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -57316,13 +57494,13 @@
     com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase lambda$getOrCreateNode$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):30:30 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase getOrCreateNode(com.android.tools.r8.graph.ProgramMethod):30:30 -> b
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation -> com.android.tools.r8.internal.L6:
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation -> com.android.tools.r8.internal.N6:
     1:1:void <init>():18:18 -> <init>
     boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation empty():33:33 -> a
     boolean isMultiCallerInlineCandidate(com.android.tools.r8.graph.ProgramMethod) -> b
     void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod) -> c
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.internal.J6:
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$CallGraphBasedCallSiteInformation -> com.android.tools.r8.internal.L6:
     java.util.Set singleCallerMethods -> a
     java.util.Set multiCallerInlineCandidates -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.callgraph.CallGraph):61:61 -> <init>
@@ -57332,7 +57510,7 @@
     4:4:boolean hasSingleCallSite(com.android.tools.r8.graph.ProgramMethod):112:112 -> a
     1:1:boolean isMultiCallerInlineCandidate(com.android.tools.r8.graph.ProgramMethod):123:123 -> b
     1:2:void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod):128:129 -> c
-com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.internal.K6:
+com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation -> com.android.tools.r8.internal.M6:
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation EMPTY_INFO -> a
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>():36:36 -> <init>
@@ -57340,7 +57518,7 @@
     boolean isMultiCallerInlineCandidate(com.android.tools.r8.graph.ProgramMethod) -> b
     1:1:com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation$EmptyCallSiteInformation access$000():36:36 -> b
     void unsetCallSiteInformation(com.android.tools.r8.graph.ProgramMethod) -> c
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator -> com.android.tools.r8.internal.Be:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator -> com.android.tools.r8.internal.Ee:
     java.util.Deque writerStack -> d
     java.util.Map stackEntryInfo -> b
     java.util.Deque clinitCallStack -> c
@@ -57415,39 +57593,39 @@
     74:76:void recordCallEdgeRemoval(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):447:449 -> b
     1:1:void removeCallEdge(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):371:371 -> c
     1:1:void removeFieldReadEdge(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):375:375 -> d
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge -> com.android.tools.r8.internal.Ae:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge -> com.android.tools.r8.internal.De:
     com.android.tools.r8.ir.conversion.callgraph.Node callee -> b
     com.android.tools.r8.ir.conversion.callgraph.Node caller -> a
     1:3:void <init>(com.android.tools.r8.ir.conversion.callgraph.Node,com.android.tools.r8.ir.conversion.callgraph.Node):35:37 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$400(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge):30:30 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$500(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CallEdge):30:30 -> b
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult -> com.android.tools.r8.internal.Be$a:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$CycleEliminationResult -> com.android.tools.r8.internal.Ee$a:
     java.util.Map removedCallEdges -> a
     1:2:void <init>(java.util.Map):58:59 -> <init>
     1:2:int numberOfRemovedCallEdges():64:65 -> a
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem -> com.android.tools.r8.internal.Ce:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem -> com.android.tools.r8.internal.Fe:
     java.util.Iterator calleesAndWriters -> b
     com.android.tools.r8.ir.conversion.callgraph.Node callerOrReader -> a
     1:3:void <init>(com.android.tools.r8.ir.conversion.callgraph.Node,java.util.Iterator):186:188 -> <init>
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem asIterator() -> a
     1:1:java.util.Iterator access$200(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem):182:182 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$300(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem):182:182 -> b
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem -> com.android.tools.r8.internal.De:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem -> com.android.tools.r8.internal.Ge:
     com.android.tools.r8.ir.conversion.callgraph.Node node -> a
     1:2:void <init>(com.android.tools.r8.ir.conversion.callgraph.Node):167:168 -> <init>
     1:1:com.android.tools.r8.ir.conversion.callgraph.Node access$100(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem):164:164 -> a
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem asNode() -> b
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo -> com.android.tools.r8.internal.Ee:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$StackEntryInfo -> com.android.tools.r8.internal.He:
     com.android.tools.r8.ir.conversion.callgraph.Node predecessor -> b
     boolean processed -> c
     int index -> a
     1:3:void <init>(int,com.android.tools.r8.ir.conversion.callgraph.Node):48:50 -> <init>
-com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$WorkItem -> com.android.tools.r8.internal.Fe:
+com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$WorkItem -> com.android.tools.r8.internal.Ie:
     1:1:void <init>():146:146 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$1):146:146 -> <init>
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$IteratorWorkItem asIterator() -> a
     com.android.tools.r8.ir.conversion.callgraph.CycleEliminator$NodeWorkItem asNode() -> b
-com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphBuilderBase -> com.android.tools.r8.internal.uo:
+com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphBuilderBase -> com.android.tools.r8.internal.zo:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):19:19 -> <init>
@@ -57466,7 +57644,7 @@
     28:28:void lambda$build$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):31:31 -> a
     29:29:com.android.tools.r8.ir.conversion.callgraph.Node com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphBuilderBase.createNode(com.android.tools.r8.graph.ProgramMethod):49:49 -> a
     29:29:com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod):16 -> a
-com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry -> com.android.tools.r8.internal.vo:
+com.android.tools.r8.ir.conversion.callgraph.IRProcessingCallGraphUseRegistry -> com.android.tools.r8.internal.Ao:
     com.android.tools.r8.graph.FieldAccessInfoCollection fieldAccessInfoCollection -> k
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():25:25 -> <clinit>
@@ -57505,7 +57683,7 @@
     17:17:void processFieldRead(com.android.tools.r8.graph.DexField):78 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:20:void processFieldRead(com.android.tools.r8.graph.DexField):79:81 -> i
-com.android.tools.r8.ir.conversion.callgraph.InvokeExtractor -> com.android.tools.r8.internal.dw:
+com.android.tools.r8.ir.conversion.callgraph.InvokeExtractor -> com.android.tools.r8.internal.jw:
     java.util.function.Function nodeFactory -> g
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.conversion.callgraph.NodeBase currentMethod -> f
@@ -57547,7 +57725,7 @@
     1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):179:179 -> f
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):184:184 -> g
-com.android.tools.r8.ir.conversion.callgraph.Node -> com.android.tools.r8.internal.kJ:
+com.android.tools.r8.ir.conversion.callgraph.Node -> com.android.tools.r8.internal.rJ:
     java.util.Set writers -> g
     java.util.Set callees -> d
     java.util.Set callers -> e
@@ -57598,14 +57776,14 @@
     216:216:java.lang.String toString():184:184 -> toString
     217:217:java.lang.String toString():185:185 -> toString
     187:214:java.lang.String toString():186:213 -> toString
-com.android.tools.r8.ir.conversion.callgraph.NodeBase -> com.android.tools.r8.internal.lJ:
+com.android.tools.r8.ir.conversion.callgraph.NodeBase -> com.android.tools.r8.internal.sJ:
     com.android.tools.r8.graph.ProgramMethod method -> b
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):14:15 -> <init>
     void addCallerConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase,boolean) -> a
     void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase) -> a
     1:1:com.android.tools.r8.graph.DexEncodedMethod getMethod():23:23 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod getProgramMethod():27:27 -> b
-com.android.tools.r8.ir.conversion.callgraph.PartialCallGraphBuilder -> com.android.tools.r8.internal.NN:
+com.android.tools.r8.ir.conversion.callgraph.PartialCallGraphBuilder -> com.android.tools.r8.internal.eO:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.ProgramMethodSet seeds -> e
     1:1:void <clinit>():15:15 -> <clinit>
@@ -57614,139 +57792,139 @@
     2:2:void populateGraph(java.util.concurrent.ExecutorService):27:27 -> a
     3:4:boolean verifyAllMethodsWithCodeExists():43:44 -> a
     1:8:void processMethod(com.android.tools.r8.graph.ProgramMethod):31:38 -> c
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.t4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter -> com.android.tools.r8.internal.v4:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods rewritableMethods -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():57:57 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):62:65 -> <init>
-    1:8:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):82:89 -> a
-    9:12:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):96:99 -> a
+    1:1:void <clinit>():58:58 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):63:66 -> <init>
+    1:8:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):83:90 -> a
+    9:12:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):97:100 -> a
     13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMember.getContextType():36:36 -> a
-    13:13:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):100 -> a
+    13:13:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):101 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):100:100 -> a
-    15:15:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$needsDesugaring$0(com.android.tools.r8.synthesis.SyntheticNaming):100:100 -> a
-    16:32:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):105:121 -> a
-    33:33:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):128:128 -> a
+    14:14:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):101:101 -> a
+    15:15:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$needsDesugaring$0(com.android.tools.r8.synthesis.SyntheticNaming):101:101 -> a
+    16:32:java.util.List generateListOfBackportedMethods(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):106:122 -> a
+    33:33:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):129:129 -> a
     34:93:void com.android.tools.r8.ir.desugar.backports.BackportedMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):59:118 -> a
-    34:93:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):128 -> a
-    94:94:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):132:132 -> a
+    34:93:void registerAssumedLibraryTypes(com.android.tools.r8.utils.InternalOptions):129 -> a
+    94:94:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):133:133 -> a
     95:95:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    95:95:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):132 -> a
+    95:95:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):133 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    96:105:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):133:142 -> a
-    106:106:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
-    106:106:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):142 -> a
+    96:105:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):134:143 -> a
+    106:106:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
+    106:106:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):143 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
-    107:107:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):142 -> a
-    108:113:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):142:147 -> a
-    1:1:boolean hasBackports():69:69 -> b
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.k4:
-    1:1:void <init>():1755:1755 -> <init>
-    1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1759:1759 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.l4:
+    107:107:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
+    107:107:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):143 -> a
+    108:113:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):143:148 -> a
+    1:1:boolean hasBackports():70:70 -> b
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$FullMethodInvokeRewriter -> com.android.tools.r8.internal.m4:
+    1:1:void <init>():1760:1760 -> <init>
+    1:1:com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):1764:1764 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$InvokeRewriter -> com.android.tools.r8.internal.n4:
     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):1635:1636 -> <init>
-    1:1:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1646:1646 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.m4:
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter):1640:1641 -> <init>
+    1:1:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1651:1651 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator -> com.android.tools.r8.internal.o4:
     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):1656:1656 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1660:1661 -> <init>
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind(com.android.tools.r8.synthesis.SyntheticNaming):1666:1666 -> a
-    2:4:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1676:1678 -> a
-    5:8:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1684:1687 -> a
-    9:9:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1685:1685 -> a
-    10:13:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1691:1694 -> a
-    14:14:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1694:1694 -> 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):1702:1702 -> a
-    15:15:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1694 -> a
-    16:16:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1698:1698 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.n4:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory):1661:1661 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory,java.lang.String):1665:1666 -> <init>
+    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind(com.android.tools.r8.synthesis.SyntheticNaming):1671:1671 -> a
+    2:4:java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator):1681:1683 -> a
+    5:8:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1689:1692 -> a
+    9:9:com.android.tools.r8.graph.ProgramMethod getSyntheticMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1690:1690 -> a
+    10:13:void lambda$getSyntheticMethod$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1696:1699 -> a
+    14:14:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1699:1699 -> 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):1707:1707 -> a
+    15:15:com.android.tools.r8.graph.Code lambda$getSyntheticMethod$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1699 -> a
+    16:16:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1703:1703 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter -> com.android.tools.r8.internal.p4:
     com.android.tools.r8.cf.code.CfInstruction rewriteSingle(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory) -> a
-    1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):1751:1751 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.o4:
+    1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):1756:1756 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider -> com.android.tools.r8.internal.q4:
     com.android.tools.r8.graph.DexMethod method -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1618:1619 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod):1623:1624 -> <init>
     java.util.Collection rewriteInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.backports.BackportedMethodDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.LocalStackAllocator) -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.p4:
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods -> com.android.tools.r8.internal.r4:
     java.util.Map typeMinApi -> a
     java.util.Map rewritable -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():152:152 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):161:161 -> <init>
-    2:67:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):159:224 -> <init>
-    1:1:boolean minApiMatchDatabaseMinApi(com.android.tools.r8.com.google.common.collect.ImmutableMap):242:242 -> a
-    2:10:void lambda$minApiMatchDatabaseMinApi$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):244:252 -> a
-    11:16:boolean com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods.typeIsInDesugaredLibrary(com.android.tools.r8.graph.DexType):263:268 -> a
-    11:16:void lambda$minApiMatchDatabaseMinApi$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):253 -> a
-    17:20:void lambda$minApiMatchDatabaseMinApi$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):254:257 -> a
-    21:21:boolean typeIsPresent(com.android.tools.r8.graph.DexType):296:296 -> a
-    22:27:boolean com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods.typeIsInDesugaredLibrary(com.android.tools.r8.graph.DexType):263:268 -> a
-    22:27:boolean typeIsPresent(com.android.tools.r8.graph.DexType):297 -> a
-    28:28:boolean isEmpty():301:301 -> a
-    29:29:void visit(java.util.function.Consumer):305:305 -> a
-    30:97:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):380:447 -> a
-    98:98:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1036:1036 -> a
-    99:100:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1605:1606 -> a
-    101:101:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1610:1610 -> a
-    1:1:boolean typeIsAbsentOrPresentWithoutBackportsFrom(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):273:273 -> b
-    2:2:boolean typeIsPresentWithoutNeverIntroducedBackports(com.android.tools.r8.graph.DexType):277:277 -> b
-    3:61:void initializeAndroidKObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):315:373 -> b
-    62:62:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1057:1057 -> b
+    1:1:void <clinit>():153:153 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):162:162 -> <init>
+    2:67:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.AppView):160:225 -> <init>
+    1:1:boolean minApiMatchDatabaseMinApi(com.android.tools.r8.com.google.common.collect.ImmutableMap):243:243 -> a
+    2:10:void lambda$minApiMatchDatabaseMinApi$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):245:253 -> a
+    11:16:boolean com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods.typeIsInDesugaredLibrary(com.android.tools.r8.graph.DexType):264:269 -> a
+    11:16:void lambda$minApiMatchDatabaseMinApi$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):254 -> a
+    17:20:void lambda$minApiMatchDatabaseMinApi$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):255:258 -> a
+    21:21:boolean typeIsPresent(com.android.tools.r8.graph.DexType):297:297 -> a
+    22:27:boolean com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods.typeIsInDesugaredLibrary(com.android.tools.r8.graph.DexType):264:269 -> a
+    22:27:boolean typeIsPresent(com.android.tools.r8.graph.DexType):298 -> a
+    28:28:boolean isEmpty():302:302 -> a
+    29:29:void visit(java.util.function.Consumer):306:306 -> a
+    30:97:void initializeAndroidKMethodProviders(com.android.tools.r8.graph.DexItemFactory):385:452 -> a
+    98:98:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$1(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1041:1041 -> a
+    99:100:void addProvider(com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider):1610:1611 -> a
+    101:101:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getProvider(com.android.tools.r8.graph.DexMethod):1615:1615 -> a
+    1:1:boolean typeIsAbsentOrPresentWithoutBackportsFrom(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):274:274 -> b
+    2:2:boolean typeIsPresentWithoutNeverIntroducedBackports(com.android.tools.r8.graph.DexType):278:278 -> b
+    3:64:void initializeAndroidKObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):317:378 -> b
+    65:65:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$2(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1062:1062 -> 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):68:73 -> c
-    1:6:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1077 -> c
+    1:6:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1082 -> c
     7:21: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):71:85 -> c
-    7:21:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1077 -> c
+    7:21:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1082 -> c
     22:22:void com.android.tools.r8.cf.code.CfNew.<init>(com.android.tools.r8.graph.DexType):38:38 -> c
     22:22: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):85 -> c
-    22:22:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1077 -> c
+    22:22:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1082 -> c
     23:42: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):85:104 -> c
-    23:42:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1077 -> c
+    23:42:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1082 -> c
     43:43: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):99:99 -> c
-    43:43:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1077 -> c
+    43:43:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1082 -> c
     44:56: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):96:108 -> c
-    44:56:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1077 -> c
-    57:62:boolean com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods.typeIsInDesugaredLibrary(com.android.tools.r8.graph.DexType):263:268 -> c
-    57:62:boolean typeIsPresentWithoutBackportsFrom(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):281 -> c
-    63:71:boolean typeIsPresentWithoutBackportsFrom(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):283:291 -> c
-    72:394:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):474:796 -> c
-    1:8:void initializeAndroidNObjectsMethodProviderWithSupplier(com.android.tools.r8.graph.DexItemFactory):1593:1600 -> d
-    1:13:void initializeAndroidNObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):457:469 -> e
-    1:159:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):803:961 -> f
-    1:109:void initializeAndroidOptionalTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1421:1529 -> g
-    1:8:void initializeAndroidRObjectsMethodProviderWithSupplier(com.android.tools.r8.graph.DexItemFactory):968:975 -> h
-    1:28:void initializeAndroidRObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):986:1013 -> i
-    1:10:void initializeAndroidRSetListMapMethodProviders(com.android.tools.r8.graph.DexItemFactory):1024:1033 -> j
-    11:35:void initializeAndroidRSetListMapMethodProviders(com.android.tools.r8.graph.DexItemFactory):1030:1054 -> j
-    36:59:void initializeAndroidRSetListMapMethodProviders(com.android.tools.r8.graph.DexItemFactory):1051:1074 -> j
-    60:78:void initializeAndroidRSetListMapMethodProviders(com.android.tools.r8.graph.DexItemFactory):1071:1089 -> j
-    1:66:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):1139:1204 -> k
-    67:67:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):1202:1202 -> k
-    1:29:void initializeAndroidSSetListMapMethodProviders(com.android.tools.r8.graph.DexItemFactory):1099:1127 -> l
-    1:62:void initializeAndroidSv2MethodProviders(com.android.tools.r8.graph.DexItemFactory):1211:1272 -> m
-    1:17:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1285:1301 -> n
-    18:67:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1295:1344 -> n
-    68:144:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1338:1414 -> n
-    1:19:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1546:1564 -> o
-    1:7:void initializePredicateMethodProviders(com.android.tools.r8.graph.DexItemFactory):1582:1588 -> p
-    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1570:1576 -> q
-    1:9:java.util.Map initializeTypeMinApi(com.android.tools.r8.graph.DexItemFactory):228:236 -> r
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.q4:
+    44:56:com.android.tools.r8.graph.CfCode lambda$initializeAndroidRSetListMapMethodProviders$3(int,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):1082 -> c
+    57:62:boolean com.android.tools.r8.ir.desugar.BackportedMethodRewriter$RewritableMethods.typeIsInDesugaredLibrary(com.android.tools.r8.graph.DexType):264:269 -> c
+    57:62:boolean typeIsPresentWithoutBackportsFrom(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):282 -> c
+    63:71:boolean typeIsPresentWithoutBackportsFrom(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.AndroidApiLevel):284:292 -> c
+    72:394:void initializeAndroidNMethodProviders(com.android.tools.r8.graph.DexItemFactory):479:801 -> c
+    1:8:void initializeAndroidNObjectsMethodProviderWithSupplier(com.android.tools.r8.graph.DexItemFactory):1598:1605 -> d
+    1:13:void initializeAndroidNObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):462:474 -> e
+    1:159:void initializeAndroidOMethodProviders(com.android.tools.r8.graph.DexItemFactory):808:966 -> f
+    1:109:void initializeAndroidOptionalTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1426:1534 -> g
+    1:8:void initializeAndroidRObjectsMethodProviderWithSupplier(com.android.tools.r8.graph.DexItemFactory):973:980 -> h
+    1:28:void initializeAndroidRObjectsMethodProviders(com.android.tools.r8.graph.DexItemFactory):991:1018 -> i
+    1:10:void initializeAndroidRSetListMapMethodProviders(com.android.tools.r8.graph.DexItemFactory):1029:1038 -> j
+    11:35:void initializeAndroidRSetListMapMethodProviders(com.android.tools.r8.graph.DexItemFactory):1035:1059 -> j
+    36:59:void initializeAndroidRSetListMapMethodProviders(com.android.tools.r8.graph.DexItemFactory):1056:1079 -> j
+    60:78:void initializeAndroidRSetListMapMethodProviders(com.android.tools.r8.graph.DexItemFactory):1076:1094 -> j
+    1:66:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):1144:1209 -> k
+    67:67:void initializeAndroidSMethodProviders(com.android.tools.r8.graph.DexItemFactory):1207:1207 -> k
+    1:29:void initializeAndroidSSetListMapMethodProviders(com.android.tools.r8.graph.DexItemFactory):1104:1132 -> l
+    1:62:void initializeAndroidSv2MethodProviders(com.android.tools.r8.graph.DexItemFactory):1216:1277 -> m
+    1:17:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1290:1306 -> n
+    18:67:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1300:1349 -> n
+    68:144:void initializeAndroidTMethodProviders(com.android.tools.r8.graph.DexItemFactory):1343:1419 -> n
+    1:19:void initializeJava11MethodProviders(com.android.tools.r8.graph.DexItemFactory):1551:1569 -> o
+    1:7:void initializePredicateMethodProviders(com.android.tools.r8.graph.DexItemFactory):1587:1593 -> p
+    1:7:void initializeStreamMethodProviders(com.android.tools.r8.graph.DexItemFactory):1575:1581 -> q
+    1:9:java.util.Map initializeTypeMinApi(com.android.tools.r8.graph.DexItemFactory):229:237 -> r
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodGenerator -> com.android.tools.r8.internal.s4:
     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):1715:1716 -> <init>
-    1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1721:1721 -> a
-    2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1698:1698 -> a
-    2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1721 -> a
-    3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1721:1721 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodWithForwardingGenerator -> com.android.tools.r8.internal.r4:
-    1:1: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):1730:1730 -> <init>
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind(com.android.tools.r8.synthesis.SyntheticNaming):1735:1735 -> a
-com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.s4:
+    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):1720:1721 -> <init>
+    1:1:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1726:1726 -> a
+    2:2:com.android.tools.r8.graph.DexProto com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodGenerator.getProto(com.android.tools.r8.graph.DexItemFactory):1703:1703 -> a
+    2:2:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1726 -> a
+    3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1726:1726 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$StatifyingMethodWithForwardingGenerator -> com.android.tools.r8.internal.t4:
+    1:1: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):1735:1735 -> <init>
+    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind(com.android.tools.r8.synthesis.SyntheticNaming):1740:1740 -> a
+com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.u4:
     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.BufferCovariantReturnTypeRewriter -> com.android.tools.r8.internal.j6:
+com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter -> com.android.tools.r8.internal.l6:
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):28:30 -> <init>
     1:15:com.android.tools.r8.graph.DexMethod matchingBufferCovariantMethod(com.android.tools.r8.graph.DexMethod):61:75 -> a
@@ -57762,34 +57940,34 @@
     35:37:boolean com.android.tools.r8.ir.desugar.BufferCovariantReturnTypeRewriter.isInvokeCandidate(com.android.tools.r8.cf.code.CfInstruction):83:85 -> a
     35:37:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):90 -> a
     38:39:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):93:94 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.g7:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring -> com.android.tools.r8.internal.j7:
     void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
     java.lang.String uniqueIdentifier() -> b
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.j7:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection -> com.android.tools.r8.internal.m7:
     1:1:void <init>():20:20 -> <init>
     void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
     1:2:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):23:24 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     3:3:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):24 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     4:4:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):24 -> a
     5:5:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):31:31 -> a
     5:5:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):26 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     6:6:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):31 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):26 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     7:7:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):31 -> a
     7:7:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):26 -> a
     8:11:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):32:35 -> a
     8:11:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):26 -> a
     12:28:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView):28:44 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$EmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.h7:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$EmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.k7:
     1:1:void <init>():84:84 -> <init>
     void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$NonEmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.i7:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection$NonEmptyCfClassSynthesizerCollection -> com.android.tools.r8.internal.l7:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Collection synthesizers -> b
     boolean $assertionsDisabled -> c
@@ -57798,7 +57976,7 @@
     1:6:void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):67:67 -> a
     11:12:void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):72:73 -> a
     13:14:void lambda$synthesizeClasses$0(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaring):77:78 -> a
-com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.k7:
+com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer -> com.android.tools.r8.internal.n7:
     java.util.Set synthesizedClasses -> a
     1:7:void <init>():16:22 -> <init>
     1:1:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):46:46 -> a
@@ -57808,13 +57986,13 @@
     1:1:void acceptEnumConversionProgramClass(com.android.tools.r8.graph.DexProgramClass):36:36 -> c
     1:1:void acceptProgramEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):26:26 -> d
     1:1:void acceptWrapperProgramClass(com.android.tools.r8.graph.DexProgramClass):31:31 -> e
-com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.Q7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaring -> com.android.tools.r8.internal.T7:
     java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory) -> a
     boolean hasPreciseNeedsDesugaring() -> a
     boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod) -> a
     void prepare(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions) -> a
     void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android.tools.r8.internal.R7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection -> com.android.tools.r8.internal.U7:
     1:1:void <init>():28:28 -> <init>
     void desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer) -> a
     java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
@@ -57826,14 +58004,14 @@
     void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer) -> a
     void withDesugaredLibraryAPIConverter(java.util.function.Consumer) -> a
     1:6:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):32:37 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     7:7:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):37 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     8:8:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):37 -> a
     9:11:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):38:40 -> a
     12:12:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection empty():44:44 -> a
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.U7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.X7:
     1:1:void <init>():50:50 -> <init>
     void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer.acceptConstantDynamicClass(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod) -> a
     void com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer.acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo) -> a
@@ -57847,7 +58025,7 @@
     void com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaringEventConsumer.acceptOutlinedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> i
     void com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer.acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod) -> j
     void com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer.acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> k
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.S7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.V7:
     java.util.Map pendingInvokeSpecialBridges -> b
     java.util.List synthesizedConstantDynamicClasses -> d
     java.util.List synthesizedLambdaClasses -> c
@@ -57862,13 +58040,13 @@
     1:1:void acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod):116:116 -> a
     2:5:void acceptInvokeSpecialBridgeInfo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):136:139 -> a
     6:6:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):144:144 -> a
-    7:7:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():257:257 -> a
+    7:7:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():261:261 -> a
     7:7:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):144 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():257:257 -> a
+    8:8:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():261:261 -> a
     8:8:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):144 -> a
     9:9:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    9:9:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():257 -> a
+    9:9:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():261 -> a
     9:9:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):144 -> a
     10:10:void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass):144:144 -> a
     11:13:void acceptLambdaClass(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):149:151 -> a
@@ -57896,7 +58074,7 @@
     1:1:void acceptOutlinedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):279:279 -> i
     1:1:void acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod):131:131 -> j
     1:1:void acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):184:184 -> k
-com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.T7:
+com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer -> com.android.tools.r8.internal.W7:
     java.util.function.BiConsumer onCompanionMethodCallback -> i
     com.android.tools.r8.graph.AppView appView -> a
     java.util.function.BiConsumer twrCloseResourceMethodConsumer -> d
@@ -57947,19 +58125,19 @@
     void acceptOutlinedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> i
     void acceptRecordMethod(com.android.tools.r8.graph.ProgramMethod) -> j
     void acceptThrowMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> k
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.v8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaring -> com.android.tools.r8.internal.y8:
     void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService) -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.y8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.B8:
     1:1:void <init>():20:20 -> <init>
     void postProcessingDesugaring(java.util.Collection,java.util.function.Predicate,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService) -> a
     1:1:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):24:24 -> a
     2:4:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):54:56 -> a
     2:4:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):25 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     5:5:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):56 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):25 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     6:6:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):56 -> a
     6:6:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):25 -> a
     7:25:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):57:75 -> a
@@ -57971,17 +58149,17 @@
     27:27:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):25 -> a
     28:28:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection.empty():32:32 -> a
     28:28:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade):28 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.w8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.z8:
     com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection INSTANCE -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>():100:100 -> <init>
     void postProcessingDesugaring(java.util.Collection,java.util.function.Predicate,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService) -> a
     1:1:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$EmptyCfPostProcessingDesugaringCollection access$000():94:94 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.x8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection -> com.android.tools.r8.internal.A8:
     java.util.List desugarings -> a
     1:2:void <init>(java.util.List):48:49 -> <init>
     1:2:void postProcessingDesugaring(java.util.Collection,java.util.function.Predicate,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):88:89 -> a
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.B8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.E8:
     1:1:void <init>():26:26 -> <init>
     void com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer.acceptEmulatedInterfaceMarkerInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClasspathClass) -> a
     void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer.acceptInterfaceInjection(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass) -> a
@@ -57990,7 +58168,7 @@
     2:2:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer createForR8(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,java.util.function.BiConsumer):40:40 -> a
     void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryAPICallbackSynthesizorEventConsumer.acceptAPIConversionCallback(com.android.tools.r8.graph.ProgramMethod) -> b
     void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer.acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.z8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$D8CfPostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.C8:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToReprocess -> b
     com.android.tools.r8.ir.conversion.D8MethodProcessor methodProcessor -> a
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection instructionDesugaring -> c
@@ -58011,7 +58189,7 @@
     1:1:void acceptCovariantRetargetMethod(com.android.tools.r8.graph.ProgramMethod):80:80 -> c
     1:1:void acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod):96:96 -> d
     1:3:void addMethodToReprocess(com.android.tools.r8.graph.ProgramMethod):62:64 -> e
-com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.A8:
+com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer$R8PostProcessingDesugaringEventConsumer -> com.android.tools.r8.internal.D8:
     com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection desugaring -> b
     java.util.function.BiConsumer missingClassConsumer -> c
     com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions additions -> a
@@ -58028,82 +58206,96 @@
     1:1:void acceptCovariantRetargetMethod(com.android.tools.r8.graph.ProgramMethod):174:174 -> c
     2:2:void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass):200:200 -> c
     1:1:void acceptForwardingMethod(com.android.tools.r8.graph.ProgramMethod):179:179 -> d
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.xe:
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.Ae:
     com.android.tools.r8.graph.DexItemFactory factory -> b
+    int $r8$clinit -> d
     com.android.tools.r8.ir.conversion.IRConverter converter -> a
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():53:53 -> <clinit>
     1:3:void <init>(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexItemFactory):57:59 -> <init>
     1:14:void process(com.android.tools.r8.graph.DexApplication$Builder):64:77 -> a
     15:15:void buildCovariantReturnTypeMethodsForClass(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.List):112:112 -> a
-    16:16:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> a
+    16:16:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> a
     16:16:void buildCovariantReturnTypeMethodsForClass(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.List):112 -> a
-    17:17:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> a
+    17:17:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> a
     17:17:void buildCovariantReturnTypeMethodsForClass(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.List):112 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:18:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):114:114 -> a
     19:20:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.methodHasCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedMethod):122:123 -> a
     19:20:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):114 -> a
-    21:21:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):115:115 -> a
-    22:22:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):135:135 -> a
-    22:22:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
-    23:24:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.methodHasCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedMethod):122:123 -> a
-    23:24:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):135 -> a
-    23:24:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
-    25:25:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):135:135 -> a
-    25:25:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
-    26:31:java.util.Set com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.getCovariantReturnTypes(com.android.tools.r8.graph.ProgramMethod):196:201 -> a
-    26:31:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):136 -> a
-    26:31:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
-    32:32:java.util.Set com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.getCovariantReturnTypes(com.android.tools.r8.graph.ProgramMethod):199:199 -> a
-    32:32:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):136 -> a
-    32:32:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
-    33:36:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):136:139 -> a
-    33:36:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
-    37:61:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):150:174 -> a
-    62:62:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.keepIf(java.util.function.Predicate):204:204 -> a
-    62:62:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):174 -> a
-    63:68:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):171:176 -> a
-    69:77:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):175:183 -> a
-    78:78:boolean lambda$buildCovariantReturnTypeMethod$2(com.android.tools.r8.graph.DexAnnotation):174:174 -> a
-    79:79:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):214:214 -> a
-    80:80:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264:264 -> a
-    80:80:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):214 -> a
-    81:81:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):268:268 -> a
-    81:81:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264 -> a
-    81:81:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):214 -> a
-    82:96:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):214:228 -> a
-    97:101:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):222:226 -> a
-    102:102:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):223:223 -> a
-    103:103:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    103:103:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):223 -> a
-    104:104:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    104:104:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    104:104:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):223 -> a
-    105:127:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):223:245 -> a
-    128:128:boolean com.android.tools.r8.graph.DexValue.isDexValueAnnotation():0:0 -> a
-    128:128:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):245 -> a
-    129:131:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):245:247 -> a
-    132:136:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):236:240 -> a
-    137:137:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):237:237 -> a
-    138:138:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    138:138:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):237 -> a
-    139:139:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    139:139:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    139:139:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):237 -> a
-    140:162:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):237:259 -> a
-    163:163:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):256:256 -> a
-    164:164:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    164:164:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):256 -> a
-    165:165:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    165:165:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    165:165:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):256 -> a
-    166:166:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):256:256 -> a
-    167:167:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264:264 -> a
-    168:168:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):268:268 -> a
-    168:168:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264 -> a
+    21:21:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264:264 -> a
+    21:21:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.methodHasCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedMethod):123 -> a
+    21:21:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):114 -> a
+    22:22:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):115:115 -> a
+    23:23:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):135:135 -> a
+    23:23:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
+    24:25:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.methodHasCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedMethod):122:123 -> a
+    24:25:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):135 -> a
+    24:25:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
+    26:26:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264:264 -> a
+    26:26:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.methodHasCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedMethod):123 -> a
+    26:26:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):135 -> a
+    26:26:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
+    27:27:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):135:135 -> a
+    27:27:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
+    28:30:java.util.Set com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.getCovariantReturnTypes(com.android.tools.r8.graph.ProgramMethod):196:198 -> a
+    28:30:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):136 -> a
+    28:30:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
+    31:31:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264:264 -> a
+    31:31:java.util.Set com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.getCovariantReturnTypes(com.android.tools.r8.graph.ProgramMethod):198 -> a
+    31:31:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):136 -> a
+    31:31:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
+    32:33:java.util.Set com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.getCovariantReturnTypes(com.android.tools.r8.graph.ProgramMethod):200:201 -> a
+    32:33:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):136 -> a
+    32:33:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
+    34:34:java.util.Set com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.getCovariantReturnTypes(com.android.tools.r8.graph.ProgramMethod):199:199 -> a
+    34:34:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):136 -> a
+    34:34:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
+    35:38:void com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.buildCovariantReturnTypeMethodsForMethod(com.android.tools.r8.graph.ProgramMethod,java.util.List):136:139 -> a
+    35:38:void lambda$buildCovariantReturnTypeMethodsForClass$1(java.util.List,java.util.List,com.android.tools.r8.graph.ProgramMethod):116 -> a
+    39:63:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):150:174 -> a
+    64:64:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.keepIf(java.util.function.Predicate):204:204 -> a
+    64:64:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):174 -> a
+    65:70:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):171:176 -> a
+    71:79:com.android.tools.r8.graph.DexEncodedMethod buildCovariantReturnTypeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):175:183 -> a
+    80:80:boolean lambda$buildCovariantReturnTypeMethod$2(com.android.tools.r8.graph.DexAnnotation):174:174 -> a
+    81:81:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264:264 -> a
+    81:81:boolean lambda$buildCovariantReturnTypeMethod$2(com.android.tools.r8.graph.DexAnnotation):174 -> a
+    82:82:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):214:214 -> a
+    83:83:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264:264 -> a
+    83:83:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):214 -> a
+    84:98:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):214:228 -> a
+    99:103:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):222:226 -> a
+    104:104:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):223:223 -> a
+    105:105:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    105:105:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):223 -> a
+    106:106:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    106:106:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    106:106:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):223 -> a
+    107:129:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):223:245 -> a
+    130:130:boolean com.android.tools.r8.graph.DexValue.isDexValueAnnotation():0:0 -> a
+    130:130:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):245 -> a
+    131:133:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):245:247 -> a
+    134:138:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):236:240 -> a
+    139:139:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):237:237 -> a
+    140:140:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    140:140:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):237 -> a
+    141:141:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    141:141:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    141:141:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):237 -> a
+    142:164:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):237:259 -> a
+    165:165:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):256:256 -> a
+    166:166:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    166:166:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):256 -> a
+    167:167:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    167:167:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    167:167:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):256 -> a
+    168:168:void getCovariantReturnTypesFromAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedAnnotation,java.util.Set):256:256 -> a
+    169:169:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.DexItemFactory):269:269 -> a
+    170:170:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):273:273 -> a
+    170:170:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation,com.android.tools.r8.graph.DexItemFactory):269 -> a
     1:1:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):87:87 -> b
-    2:3:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.hasVirtualMethodWithSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):273:274 -> b
+    2:3:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.hasVirtualMethodWithSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):278:279 -> b
     2:3:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):88 -> b
     4:8:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):89:93 -> b
     9:9:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):90:90 -> b
@@ -58117,7 +58309,9 @@
     22:22:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):99 -> b
     23:27:void updateClass(com.android.tools.r8.graph.DexClass,java.util.List,java.util.List):98:102 -> b
     28:28:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):99:99 -> b
-com.android.tools.r8.ir.desugar.DesugarDescription -> com.android.tools.r8.internal.bg:
+    29:29:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):264:264 -> b
+    29:29:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):99 -> b
+com.android.tools.r8.ir.desugar.DesugarDescription -> com.android.tools.r8.internal.fg:
     com.android.tools.r8.ir.desugar.DesugarDescription NOTHING -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.DesugarDescription$1):23:23 -> <init>
@@ -58128,21 +58322,21 @@
     boolean needsDesugaring() -> c
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription nothing():47:47 -> d
     void scan() -> e
-com.android.tools.r8.ir.desugar.DesugarDescription$Builder -> com.android.tools.r8.internal.Vf:
+com.android.tools.r8.ir.desugar.DesugarDescription$Builder -> com.android.tools.r8.internal.Zf:
     1:1:void <init>():70:70 -> <init>
     com.android.tools.r8.ir.desugar.DesugarDescription$Builder addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback) -> a
     com.android.tools.r8.ir.desugar.DesugarDescription build() -> a
     com.android.tools.r8.ir.desugar.DesugarDescription$Builder setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback) -> a
-com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback -> com.android.tools.r8.internal.Wf:
+com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback -> com.android.tools.r8.internal.ag:
     java.util.Collection desugarInstruction(com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder -> com.android.tools.r8.internal.Xf:
+com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder -> com.android.tools.r8.internal.bg:
     com.android.tools.r8.ir.desugar.DesugarDescription$InitialBuilder INSTANCE -> a
     1:1:void <clinit>():83:83 -> <clinit>
     1:1:void <init>():82:82 -> <init>
     1:1:com.android.tools.r8.ir.desugar.DesugarDescription build():91:91 -> a
     2:2:com.android.tools.r8.ir.desugar.DesugarDescription$Builder addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):96:96 -> a
     3:3:com.android.tools.r8.ir.desugar.DesugarDescription$Builder setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):101:101 -> a
-com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder -> com.android.tools.r8.internal.Zf:
+com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder -> com.android.tools.r8.internal.dg:
     java.util.List scanEffects -> a
     com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback desugarRewrite -> b
     boolean $assertionsDisabled -> c
@@ -58151,15 +58345,15 @@
     1:2:com.android.tools.r8.ir.desugar.DesugarDescription$Builder addScanEffect(com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback):112:113 -> a
     3:5:com.android.tools.r8.ir.desugar.DesugarDescription$Builder setDesugarRewrite(com.android.tools.r8.ir.desugar.DesugarDescription$DesugarCallback):119:121 -> a
     6:6:com.android.tools.r8.ir.desugar.DesugarDescription build():127:127 -> a
-com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder$1 -> com.android.tools.r8.internal.Yf:
+com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder$1 -> com.android.tools.r8.internal.cg:
     com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder this$0 -> b
     1:1:void <init>(com.android.tools.r8.ir.desugar.DesugarDescription$NonEmptyBuilder):127:127 -> <init>
     1:3:java.util.Collection desugarInstruction(com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):146:148 -> a
     1:1:boolean needsDesugaring():135:135 -> c
     1:1:void scan():130:130 -> e
-com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback -> com.android.tools.r8.internal.ag:
+com.android.tools.r8.ir.desugar.DesugarDescription$ScanCallback -> com.android.tools.r8.internal.eg:
     void scan() -> a
-com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.ui:
+com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.yi:
     com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():25:25 -> <init>
@@ -58173,9 +58367,9 @@
     void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer) -> a
     void withDesugaredLibraryAPIConverter(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.ir.desugar.EmptyCfInstructionDesugaringCollection getInstance():29:29 -> b
-com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.Rl:
+com.android.tools.r8.ir.desugar.FreshLocalProvider -> com.android.tools.r8.internal.Wl:
     int getFreshLocal(int) -> a
-com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.internal.rw:
+com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter -> com.android.tools.r8.internal.xw:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():28:28 -> <init>
@@ -58187,7 +58381,7 @@
     18:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter.privateMethodInvokedOnSelf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):61:67 -> a
     18:24:boolean com.android.tools.r8.ir.desugar.InvokeToPrivateRewriter.isInvokingPrivateMethodOnSelf(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):74 -> a
     18:24:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):57 -> a
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.tC:
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.zC:
     com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring desugaring -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor -> d
@@ -58327,7 +58521,7 @@
     253:258:com.android.tools.r8.graph.DexField getCaptureField(int):150:155 -> a
     259:259:com.android.tools.r8.graph.DexField getCaptureField(int):152:152 -> a
     260:261:boolean canAccessModifyLambdaImplMethod():357:358 -> a
-    262:262:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1972:1972 -> a
+    262:262:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1948:1948 -> a
     262:262:boolean canAccessModifyLambdaImplMethod():358 -> a
     263:266:boolean com.android.tools.r8.ir.desugar.LambdaClass.isPrivateOrStaticInterfaceMethodInvokeThatWillBeDesugared():350:353 -> a
     263:266:boolean canAccessModifyLambdaImplMethod():359 -> a
@@ -58337,7 +58531,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     270:270:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):185:185 -> a
     270:270:boolean canAccessModifyLambdaImplMethod():361 -> a
-    271:271:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    271:271:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     271:271:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):185 -> a
     271:271:boolean canAccessModifyLambdaImplMethod():361 -> a
     272:273:boolean canAccessModifyLambdaImplMethod():361:362 -> a
@@ -58373,7 +58567,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):185:185 -> b
     10:10:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):371 -> b
-    11:11:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> b
+    11:11:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> b
     11:11:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.delegatesToLambdaImplMethod(com.android.tools.r8.graph.DexItemFactory):185 -> b
     11:11:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):371 -> b
     12:62:com.android.tools.r8.ir.desugar.LambdaClass$Target createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):371:421 -> b
@@ -58490,7 +58684,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isStateless():201:201 -> f
     3:3:boolean isStatelessSingleton():159 -> f
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.lC:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.rC:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> h
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppView appView -> f
@@ -58507,81 +58701,81 @@
     54:77:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):28:51 -> a
     54:77:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):843 -> a
     78:85:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):842:849 -> a
-    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     86:86:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):849 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    87:87:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    87:87:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     87:87:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):849 -> a
     88:90:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):849:851 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.mC:
+com.android.tools.r8.ir.desugar.LambdaClass$D8SpecificTarget -> com.android.tools.r8.internal.sC:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):590:590 -> <init>
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.nC:
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.tC:
     com.android.tools.r8.graph.DexMethod implMethod -> f
     com.android.tools.r8.graph.AppView appView -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():727:727 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):734:736 -> <init>
     1:33:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):746:778 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     34:34:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):778 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     35:35:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):778 -> a
     36:39:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):778:781 -> a
-    40:40:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    40:40:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     40:40:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):781 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     41:41:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):781 -> a
     42:42:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):782:782 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     43:43:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):782 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    44:44:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    44:44:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     44:44:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):782 -> a
     45:54:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):782:791 -> a
     55:73:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):754:772 -> a
     74:74:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):771:771 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.oC:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.uC:
     com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.graph.DexMethod implMethod -> g
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():635:635 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):642:644 -> <init>
     1:38:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):653:690 -> a
-    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     39:39:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):690 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    40:40:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    40:40:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     40:40:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):690 -> a
     41:44:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):690:693 -> a
-    45:45:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    45:45:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     45:45:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):693 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    46:46:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    46:46:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     46:46:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):693 -> a
     47:47:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):694:694 -> a
-    48:48:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    48:48:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     48:48:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):694 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    49:49:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    49:49:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     49:49:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):694 -> a
     50:59:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):694:703 -> a
     60:78:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):663:681 -> a
     79:83:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):680:684 -> a
     84:84:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,com.android.tools.r8.graph.DexEncodedMethod):683:683 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.pC:
+com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.vC:
     com.android.tools.r8.graph.DexType exceptionType -> f
     1:716:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType,boolean):0:715 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.qC:
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.wC:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):598:598 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.rC:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.xC:
     com.android.tools.r8.graph.ProgramMethod target -> f
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod,boolean):615:616 -> <init>
     1:4:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):624:627 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.sC:
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.yC:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexMethod callTarget -> a
@@ -58591,10 +58785,10 @@
     1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):556:561 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer) -> a
     1:3:void ensureAccessibilityIfNeeded(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):577:579 -> b
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.uC:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.AC:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.vC:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.BC:
     com.android.tools.r8.graph.MethodAccessFlags targetAccessFlags -> j
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
@@ -58708,7 +58902,7 @@
     2028:2031:boolean isSameOrDerived(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):462:465 -> a
     1:1:com.android.tools.r8.graph.DexMethod getMainMethod():67:67 -> 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):268:269 -> b
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.AC:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.GC:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():44:44 -> <clinit>
     1:15:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):97:111 -> a
@@ -58843,7 +59037,7 @@
     467:467:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):780:780 -> a
     467:467: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):432 -> a
     467:467: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):387 -> a
-    468:469:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):727:728 -> a
+    468:469:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):729:730 -> a
     468:469:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     468:469: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):434 -> a
     468:469: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):387 -> a
@@ -58852,33 +59046,33 @@
     470:470: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):387 -> a
     471:471: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):435:435 -> a
     471:471: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):387 -> a
-    472:472:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    472:472:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     472:472:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     472:472: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):434 -> a
     472:472: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):387 -> a
     473:473: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):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":534,"2":535,"3":536,"4":537,"5":538}}
-    534:534:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    534:534:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     534:534:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     534:534: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):434 -> a
     534:534: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):387 -> a
-    535:535:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    535:535:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     535:535:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     535:535: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):434 -> a
     535:535: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):387 -> a
-    536:536:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    536:536:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     536:536:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     536:536: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):434 -> a
     536:536: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):387 -> a
-    537:537:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    537:537:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     537:537:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     537:537: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):434 -> a
     537:537: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):387 -> a
-    538:538:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    538:538:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     538:538:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     538:538: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):434 -> a
     538:538: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):387 -> a
-    474:474:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    474:474:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     474:474:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):544 -> a
     474:474: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):434 -> a
     474:474: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):387 -> a
@@ -58910,49 +59104,49 @@
     489:489: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):387 -> a
     490:490: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):444:444 -> a
     490:490: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):387 -> a
-    491:491:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):737:737 -> a
+    491:491:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):739:739 -> a
     491:491:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     491:491: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):451 -> a
     491:491: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):387 -> a
     492:492:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):780:780 -> a
-    492:492:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):738 -> a
+    492:492:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740 -> a
     492:492:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     492:492: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):451 -> a
     492:492: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):387 -> a
-    493:494:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:743 -> a
+    493:494:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):744:745 -> a
     493:494:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     493:494: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):451 -> a
     493:494: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):387 -> a
     495:495:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):553:553 -> a
     495:495: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):451 -> a
     495:495: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):387 -> a
-    496:496:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    496:496:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     496:496:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     496:496: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):451 -> a
     496:496: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):387 -> a
     497:497: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):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":544,"2":545,"3":546,"4":547,"5":548}}
-    544:544:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    544:544:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     544:544:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     544:544: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):451 -> a
     544:544: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):387 -> a
-    545:545:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    545:545:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     545:545:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     545:545: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):451 -> a
     545:545: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):387 -> a
-    546:546:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    546:546:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     546:546:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     546:546: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):451 -> a
     546:546: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):387 -> a
-    547:547:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    547:547:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     547:547:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     547:547: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):451 -> a
     547:547: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):387 -> a
-    548:548:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    548:548:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     548:548:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     548:548: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):451 -> a
     548:548: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):387 -> a
-    498:498:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    498:498:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     498:498:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveBoxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):552 -> a
     498:498: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):451 -> a
     498:498: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):387 -> a
@@ -59003,12 +59197,12 @@
     1200:1200:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
     1201:1201:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
     1191:1191:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):537:537 -> a
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.zC:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode$1 -> com.android.tools.r8.internal.FC:
     int[] $SwitchMap$com$android$tools$r8$ir$code$NumericType -> a
     1:1:void <clinit>():492:492 -> <clinit>
-com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.jE:
+com.android.tools.r8.ir.desugar.LocalStackAllocator -> com.android.tools.r8.internal.qE:
     void allocateLocalStack(int) -> a
-com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.oJ:
+com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection -> com.android.tools.r8.internal.vJ:
     java.util.List desugarings -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> f
@@ -59020,10 +59214,10 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):63:63 -> <init>
     2:89:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):51:138 -> <init>
     1:2:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):143:144 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     3:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):144 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     4:4:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):144 -> a
     5:6:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):144:145 -> a
     7:7:com.android.tools.r8.androidapi.AndroidApiLevelCompute com.android.tools.r8.androidapi.AndroidApiLevelCompute.noAndroidApiLevelCompute():54:54 -> a
@@ -59098,7 +59292,7 @@
     30:30:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):347 -> b
     31:31:boolean lambda$needsDesugaring$8(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaring):348:348 -> b
     1:1:boolean lambda$noDesugaringBecauseOfImpreciseDesugaring$5(com.android.tools.r8.ir.desugar.CfInstructionDesugaring):255:255 -> c
-com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.internal.WO:
+com.android.tools.r8.ir.desugar.ProgramAdditions -> com.android.tools.r8.internal.oP:
     java.util.Map additions -> b
     java.util.Set added -> a
     boolean $assertionsDisabled -> c
@@ -59109,7 +59303,7 @@
     11:11:void apply(java.util.concurrent.ExecutorService):45:45 -> a
     12:13:void lambda$apply$1(com.android.tools.r8.graph.DexProgramClass,java.util.List):48:49 -> a
     1:1:void accept(java.lang.Object,java.lang.Object):25:25 -> accept
-com.android.tools.r8.ir.desugar.TypeRewriter -> com.android.tools.r8.internal.W20:
+com.android.tools.r8.ir.desugar.TypeRewriter -> com.android.tools.r8.internal.s30:
     1:1:void <init>():15:15 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
@@ -59118,14 +59312,14 @@
     1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):28:28 -> a
     2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView):32:36 -> 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.TypeRewriter$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.U20:
+com.android.tools.r8.ir.desugar.TypeRewriter$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.q30:
     1:1:void <init>():102:102 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType rewrittenContextType(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.TypeRewriter$MachineDesugarPrefixRewritingMapper -> com.android.tools.r8.internal.V20:
+com.android.tools.r8.ir.desugar.TypeRewriter$MachineDesugarPrefixRewritingMapper -> com.android.tools.r8.internal.r30:
     java.util.Map rewriteType -> a
     java.util.Map rewriteDerivedTypeOnly -> b
     boolean $assertionsDisabled -> c
@@ -59186,7 +59380,7 @@
     90:94:void lambda$ensureOutlineMethod$3(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):180:184 -> a
     95:104:void lambda$ensureOutlineMethod$3(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):178:187 -> a
     105:113:com.android.tools.r8.graph.Code lambda$ensureOutlineMethod$2(boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):190:198 -> a
-com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.u4:
+com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.w4:
     1:20:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2234:2253 -> A
     21:21:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> A
     21:21:com.android.tools.r8.graph.CfCode IntegerMethods_compare(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2253 -> A
@@ -61339,48 +61533,48 @@
     560:606:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6685:6731 -> z0
     607:607:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6727:6727 -> z0
     608:1107:com.android.tools.r8.graph.CfCode ObjectsMethods_deepEquals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):6237:6736 -> z0
-com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.I5:
+com.android.tools.r8.ir.desugar.backports.BooleanMethodRewrites -> com.android.tools.r8.internal.K5:
     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.pc:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodGenerators -> com.android.tools.r8.internal.sc:
     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:33: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:63 -> 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.qc:
+com.android.tools.r8.ir.desugar.backports.CollectionMethodRewrites -> com.android.tools.r8.internal.tc:
     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.ul:
+com.android.tools.r8.ir.desugar.backports.FloatMethodRewrites -> com.android.tools.r8.internal.zl:
     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.NE:
+com.android.tools.r8.ir.desugar.backports.LongMethodRewrites -> com.android.tools.r8.internal.UE:
     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.bK:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites -> com.android.tools.r8.internal.iK:
     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):30:31 -> a
     3:3:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteAsIdentity():36:36 -> 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):20:23 -> b
     5:5:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToAddInstruction():29:29 -> b
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToInvokeMath():19:19 -> c
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.aK:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.hK:
     1:1:void <init>():36:36 -> <init>
     1:1:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):41:41 -> a
-com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites -> com.android.tools.r8.internal.xM:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites -> com.android.tools.r8.internal.OM:
     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):24:27 -> a
     5:5:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteRequireNonNull():33:33 -> a
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteToArraysHashCode():23:23 -> b
-com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.wM:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.NM:
     1:1:void <init>():33:33 -> <init>
     1:2:java.util.Collection rewrite(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.desugar.LocalStackAllocator):39:40 -> a
-com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.TM:
+com.android.tools.r8.ir.desugar.backports.OptionalMethodRewrites -> com.android.tools.r8.internal.kN:
     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
@@ -61392,10 +61586,10 @@
     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.backports.SparseArrayMethodRewrites -> com.android.tools.r8.internal.XX:
+com.android.tools.r8.ir.desugar.backports.SparseArrayMethodRewrites -> com.android.tools.r8.internal.sY:
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter rewriteSet():17:17 -> a
     2:2:com.android.tools.r8.cf.code.CfInstruction lambda$rewriteSet$0(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.DexItemFactory):18:18 -> a
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass -> com.android.tools.r8.internal.Ud:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass -> com.android.tools.r8.internal.Xd:
     com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference reference -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean isFinalBootstrapMethodReferenceOnInterface -> i
@@ -61530,15 +61724,15 @@
     171:171:com.android.tools.r8.graph.Code adaptCode(com.android.tools.r8.graph.DexEncodedMethod):434 -> a
     172:173:com.android.tools.r8.cf.code.CfInstruction lambda$adaptCode$1(com.android.tools.r8.cf.code.CfInstruction):424:425 -> a
     1:33:void rewriteBootstrapMethodSignatureIfNeeded():367:399 -> b
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> b
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> b
     34:34:void rewriteBootstrapMethodSignatureIfNeeded():399 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> b
+    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> b
     35:35:void rewriteBootstrapMethodSignatureIfNeeded():399 -> b
     36:44:void rewriteBootstrapMethodSignatureIfNeeded():399:407 -> b
     45:60:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteBootstrapMethodSignatureIfNeeded$0(com.android.tools.r8.graph.DexEncodedMethod):378:393 -> b
     1:2:boolean shouldRewriteBootstrapMethodSignature():173:174 -> c
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.Vd:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicInstructionDesugaring -> com.android.tools.r8.internal.Yd:
     java.util.Map dynamicConstantSyntheticsPerClass -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):32:32 -> <init>
@@ -61559,7 +61753,7 @@
     29:29:void lambda$createConstantDynamicClass$2(com.android.tools.r8.utils.Box,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):123:123 -> a
     1:3:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass ensureConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):89:91 -> b
     4:17:com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass ensureConstantDynamicClass(com.android.tools.r8.cf.code.CfConstDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicDesugaringEventConsumer):90:103 -> b
-com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.android.tools.r8.internal.Wd:
+com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicReference -> com.android.tools.r8.internal.Zd:
     java.lang.Object[] bootstrapMethodArguments -> d
     com.android.tools.r8.graph.DexString name -> a
     boolean $assertionsDisabled -> e
@@ -61584,7 +61778,7 @@
     1:1:boolean hasApiLevelGreaterOrEqual():40:40 -> c
     1:6:boolean equals(java.lang.Object):48:53 -> equals
     1:1:int hashCode():58:58 -> hashCode
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender -> com.android.tools.r8.internal.eg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender -> com.android.tools.r8.internal.ig:
     com.android.tools.r8.androidapi.ComputedApiLevel minAPILevel -> c
     com.android.tools.r8.graph.DexDefinitionSupplier definitions -> a
     com.android.tools.r8.utils.Reporter reporter -> b
@@ -61601,7 +61795,7 @@
     49:54:com.android.tools.r8.graph.DexLibraryClass com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibraryAmender.getLibraryClass(com.android.tools.r8.graph.DexReference):112:112 -> a
     49:54:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):91 -> a
     55:65:void amendLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags):95:105 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification -> com.android.tools.r8.internal.qg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification -> com.android.tools.r8.internal.ug:
     1:1:void <clinit>():17:17 -> <clinit>
     java.lang.String getJsonSource() -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification toMachineSpecification(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.Timing) -> a
@@ -61611,10 +61805,10 @@
     com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationApiLevel() -> c
     java.util.List getExtraKeepRules() -> d
     java.lang.String getSynthesizedLibraryClassesPackagePrefix() -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.pg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.tg:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():51:51 -> <clinit>
-com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.rg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.vg:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:20:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification parseDesugaredLibrarySpecification(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int):30:49 -> a
@@ -61623,9 +61817,9 @@
     41:41:com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification parseDesugaredLibrarySpecificationforTesting(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,int,java.util.function.Consumer):68:68 -> a
     42:51:boolean isHumanSpecification(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):82:91 -> a
     52:52:boolean isHumanSpecification(com.android.tools.r8.com.google.gson.JsonObject,com.android.tools.r8.utils.Reporter,com.android.tools.r8.origin.Origin):83:83 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder -> com.android.tools.r8.internal.m10:
+com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder -> com.android.tools.r8.internal.I10:
     com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder setSupportAllCallbacksFromLibrary(boolean) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer -> com.android.tools.r8.internal.cg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer -> com.android.tools.r8.internal.gg:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -61639,20 +61833,20 @@
     6:11:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):58:63 -> a
     12:36:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):101:125 -> a
     12:36:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):64 -> a
-    37:37:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    37:37:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     37:37:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):125 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     37:37:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):64 -> a
-    38:38:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    38:38:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     38:38:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):125 -> a
     38:38:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):64 -> a
     39:40:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):129:130 -> a
     39:40:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):64 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     41:41:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     41:41:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):64 -> a
-    42:42:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    42:42:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     42:42:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):130 -> a
     42:42:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):64 -> a
     43:43:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):133:133 -> a
@@ -61669,15 +61863,15 @@
     79:80:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
     79:80:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):152 -> a
     81:84:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):153:156 -> a
-    85:85:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    85:85:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     85:85:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):156 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     86:86:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):156 -> a
     87:93:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):180:186 -> a
     87:93:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):159 -> a
     94:100:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):162:168 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.dg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.hg:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> d
     java.util.Set emulatedMethods -> c
@@ -61764,7 +61958,7 @@
     330:330:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):220:220 -> a
     331:334:com.android.tools.r8.graph.DexType vivifiedTypeFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):219:222 -> a
     1:1:void generateTrackingWarnings():197:197 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider -> com.android.tools.r8.internal.fg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider -> com.android.tools.r8.internal.jg:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer wrapperSynthesizer -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -61819,27 +62013,27 @@
     265:265:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):38:38 -> a
     265:265:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):361 -> a
     266:267:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):361:362 -> a
-    268:268:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):727:727 -> a
+    268:268:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):729:729 -> a
     268:268:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):362 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    269:270:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):727:728 -> a
+    269:270:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):729:730 -> a
     269:270:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):362 -> a
     271:271:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):363:363 -> a
-    272:272:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    272:272:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     272:272:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):362 -> a
     273:273:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":282,"2":283,"3":284,"4":285,"5":286}}
-    282:282:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    282:282:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     282:282:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):362 -> a
-    283:283:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    283:283:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     283:283:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):362 -> a
-    284:284:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    284:284:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     284:284:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):362 -> a
-    285:285:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    285:285:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     285:285:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):362 -> a
-    286:286:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    286:286:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     286:286:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):362 -> a
-    274:274:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):730:730 -> a
+    274:274:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getUnboxPrimitiveMethod(com.android.tools.r8.graph.DexType):732:732 -> a
     274:274:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):362 -> a
     275:275:void addOutlineParameterConversionInstructions(com.android.tools.r8.graph.DexMethod[],java.util.ArrayList,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):365:365 -> a
     276:276:void com.android.tools.r8.cf.code.CfCheckCast.<init>(com.android.tools.r8.graph.DexType):38:38 -> a
@@ -61850,43 +62044,43 @@
     293:293:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347:347 -> a
     294:307:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):374:387 -> a
     294:307:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
-    308:308:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):737:737 -> a
+    308:308:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):739:739 -> a
     308:308:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):387 -> a
     308:308:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    309:309:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):737:737 -> a
+    309:309:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):739:739 -> a
     309:309:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):387 -> a
     309:309:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
     310:310:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):780:780 -> a
-    310:310:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):738 -> a
+    310:310:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740 -> a
     310:310:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):387 -> a
     310:310:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
-    311:312:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:743 -> a
+    311:312:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):744:745 -> a
     311:312:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):387 -> a
     311:312:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
     313:313:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):388:388 -> a
     313:313:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
-    314:314:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    314:314:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     314:314:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):387 -> a
     314:314:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
     315:315:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":329,"2":330,"3":331,"4":332,"5":333}}
-    329:329:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    329:329:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     329:329:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):387 -> a
     329:329:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
-    330:330:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    330:330:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     330:330:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):387 -> a
     330:330:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
-    331:331:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    331:331:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     331:331:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):387 -> a
     331:331:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
-    332:332:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    332:332:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     332:332:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):387 -> a
     332:332:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
-    333:333:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    333:333:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     333:333:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):387 -> a
     333:333:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
-    316:316:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):740:740 -> a
+    316:316:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.getBoxPrimitiveMethod(com.android.tools.r8.graph.DexType):742:742 -> a
     316:316:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):387 -> a
     316:316:com.android.tools.r8.graph.Code lambda$addOutlineParameterConversionInstructions$6(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexMethod):347 -> a
     317:328:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.computeParameterConversionCfCode(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[]):390:401 -> a
@@ -61916,10 +62110,10 @@
     397:397:com.android.tools.r8.graph.DexMethod convertedMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod[],com.android.tools.r8.graph.DexType):582:582 -> a
     1:2:com.android.tools.r8.graph.DexEncodedMethod generateWrapperConversionWithoutCode(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField):69:70 -> b
     3:4:com.android.tools.r8.graph.DexEncodedMethod generateWrapperConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,java.util.function.Supplier):78:79 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> b
     5:5:com.android.tools.r8.graph.DexEncodedMethod generateWrapperConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,java.util.function.Supplier):79 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> b
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> b
     6:6:com.android.tools.r8.graph.DexEncodedMethod generateWrapperConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,java.util.function.Supplier):79 -> b
     7:8:com.android.tools.r8.graph.DexEncodedMethod generateWrapperConversion(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,java.util.function.Supplier):79:80 -> b
     9:12:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.resolveContext(com.android.tools.r8.graph.DexMethod,boolean):426:429 -> b
@@ -61957,7 +62151,7 @@
     72:72:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryConversionCfProvider.internalComputeReturnConversion(com.android.tools.r8.graph.DexMethod,java.util.function.BiFunction,com.android.tools.r8.graph.ProgramMethod):475:475 -> b
     72:72:com.android.tools.r8.graph.DexMethod computeReturnConversion(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,com.android.tools.r8.graph.ProgramMethod,java.util.function.Supplier):456 -> b
     73:73:com.android.tools.r8.graph.DexMethod lambda$computeReturnConversion$9(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer,java.util.function.Supplier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):459:459 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer -> com.android.tools.r8.internal.gg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer -> com.android.tools.r8.internal.kg:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -61976,10 +62170,10 @@
     49:55:com.android.tools.r8.graph.DexMethod getExistingProgramEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):115:121 -> a
     56:58:com.android.tools.r8.graph.DexMethod getExistingProgramEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):120:122 -> a
     59:63:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):128:132 -> a
-    64:64:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    64:64:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     64:64:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):132 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    65:65:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    65:65:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     65:65:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):132 -> a
     66:77:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):132:143 -> a
     78:78:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):138:138 -> a
@@ -61995,7 +62189,7 @@
     12:12:void lambda$ensureEnumConversionClass$13(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):162:162 -> b
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureProgramEnumConversionClass$9(com.android.tools.r8.synthesis.SyntheticNaming):139:139 -> c
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$getExistingProgramEnumConversionMethod$8(com.android.tools.r8.synthesis.SyntheticNaming):118:118 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.tg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.xg:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryEnumConversionSynthesizer enumConverter -> c
@@ -62024,11 +62218,11 @@
     36:36:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):135 -> a
     18:29:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):366:377 -> a
     18:29:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):135 -> a
-    30:30:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     30:30:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):377 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:30:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):135 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     31:31:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):377 -> a
     31:31:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):135 -> a
     32:32:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):380:380 -> a
@@ -62083,10 +62277,10 @@
     205:209:com.android.tools.r8.graph.DexMethod getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):345:349 -> a
     210:210:com.android.tools.r8.graph.DexMethod getCustomConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):348:348 -> a
     211:215:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):389:393 -> a
-    216:216:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    216:216:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     216:216:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):393 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    217:217:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    217:217:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     217:217:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):393 -> a
     218:219:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):393:394 -> a
     220:229:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):423:432 -> a
@@ -62096,10 +62290,10 @@
     240:256:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):435:451 -> a
     257:267:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):444:454 -> a
     268:268:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):460:460 -> a
-    269:269:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    269:269:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     269:269:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):460 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    270:270:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     270:270:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):460 -> a
     271:272:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):460:461 -> a
     273:273:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector):472:472 -> a
@@ -62125,10 +62319,10 @@
     296:296:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):737:737 -> a
     296:296:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):550 -> a
     297:297:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):497:497 -> a
-    298:298:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    298:298:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     298:298:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):497 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    299:299:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    299:299:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     299:299:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):497 -> a
     300:311:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):497:508 -> a
     312:312:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):501:501 -> a
@@ -62169,10 +62363,10 @@
     412:433:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):695:716 -> a
     434:444:void lambda$synthesizeClasses$20(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):702:712 -> a
     445:448:void ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):725:728 -> a
-    449:449:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    449:449:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     449:449:void ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):728 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    450:450:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    450:450:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     450:450:void ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):728 -> a
     451:453:void ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):728:730 -> a
     454:454:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.vivifiedTypeFor(com.android.tools.r8.graph.DexType):399:399 -> a
@@ -62221,18 +62415,18 @@
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$getExistingProgramWrapperConversions$11(com.android.tools.r8.synthesis.SyntheticNaming):462:462 -> l
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$isSyntheticWrapper$0(com.android.tools.r8.synthesis.SyntheticNaming):117:117 -> m
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$isSyntheticWrapper$1(com.android.tools.r8.synthesis.SyntheticNaming):118:118 -> n
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.sg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions -> com.android.tools.r8.internal.wg:
     com.android.tools.r8.graph.DexMethod vivifiedConversion -> b
     com.android.tools.r8.graph.DexMethod conversion -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):407:409 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getConversion():413:413 -> a
     1:1:com.android.tools.r8.graph.DexMethod getVivifiedConversion():417:417 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer -> com.android.tools.r8.internal.vg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer -> com.android.tools.r8.internal.zg:
     void acceptCollectionConversion(com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer -> com.android.tools.r8.internal.ug:
+com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer -> com.android.tools.r8.internal.yg:
     void acceptWrapperClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> b
     void acceptEnumConversionClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.Ln:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.Qn:
     com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags topLevelFlags -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags rewritingFlags -> c
     boolean libraryCompilation -> a
@@ -62253,7 +62447,7 @@
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags getRewritingFlags():72:72 -> g
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags getTopLevelFlags():68:68 -> h
     1:1:boolean isEmpty():40:40 -> isEmpty
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.Mn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.Rn:
     com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.memberparser.HumanFieldParser fieldParser -> c
     com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.memberparser.HumanMethodParser methodParser -> b
     boolean $assertionsDisabled -> i
@@ -62324,7 +62518,7 @@
     1:2:com.android.tools.r8.origin.Origin getOrigin():109:110 -> b
     3:3:com.android.tools.r8.graph.DexType stringDescriptorToDexType(java.lang.String):405:405 -> b
     1:1:com.android.tools.r8.utils.Reporter reporter():101:101 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags -> com.android.tools.r8.internal.Pn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags -> com.android.tools.r8.internal.Un:
     java.util.Map amendLibraryField -> q
     java.util.Map wrapperConversions -> o
     java.util.Map amendLibraryMethod -> p
@@ -62365,7 +62559,7 @@
     1:1:java.util.Map getRewritePrefix():132:132 -> p
     1:1:java.util.Map getWrapperConversions():188:188 -> q
     1:8:boolean isEmpty():200:207 -> r
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder -> com.android.tools.r8.internal.Pn$a:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder -> com.android.tools.r8.internal.Un$a:
     java.util.Map wrapperConversions -> q
     java.util.Map amendLibraryMethod -> r
     java.util.Map amendLibraryField -> s
@@ -62419,7 +62613,7 @@
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder putMaintainPrefix(java.lang.String):330:330 -> c
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder retargetMethodEmulatedDispatch(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):401:401 -> c
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder putLegacyBackport(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):418:418 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags -> com.android.tools.r8.internal.Wn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags -> com.android.tools.r8.internal.bo:
     java.util.List extraKeepRules -> f
     boolean supportAllCallbacksFromLibrary -> e
     java.lang.String identifier -> c
@@ -62435,7 +62629,7 @@
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():62:62 -> f
     1:1:boolean supportAllCallbacksFromLibrary():74:74 -> g
     1:2:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags testing():49:50 -> h
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder -> com.android.tools.r8.internal.Vn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder -> com.android.tools.r8.internal.ao:
     java.lang.Boolean supportAllCallbacksFromLibrary -> e
     java.util.List extraKeepRules -> f
     boolean $assertionsDisabled -> g
@@ -62454,7 +62648,7 @@
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setJsonSource(java.lang.String):108:108 -> b
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setSupportAllCallbacksFromLibrary(boolean):114:114 -> b
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags$Builder setSynthesizedLibraryClassesPackagePrefix(java.lang.String):98:98 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.AH:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification -> com.android.tools.r8.internal.HH:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags topLevelFlags -> b
     java.util.Map commonFlags -> c
@@ -62466,7 +62660,7 @@
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> c
     1:1:java.util.Map getProgramFlags():49:49 -> d
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanTopLevelFlags getTopLevelFlags():37:37 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationFlagDeduplicator -> com.android.tools.r8.internal.BH:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationFlagDeduplicator -> com.android.tools.r8.internal.IH:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:6:void deduplicateFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.utils.Reporter):26:31 -> a
@@ -62503,7 +62697,7 @@
     1:2:void deduplicateRewriteDifferentPrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):175:176 -> c
     1:2:void deduplicateRewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):202:203 -> d
     1:4:void deduplicateWrapperFlags(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder):137:140 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter -> com.android.tools.r8.internal.DH:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter -> com.android.tools.r8.internal.KH:
     1:1:void <init>():49:49 -> <init>
     1:1:void export(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer):53:53 -> a
     2:7:void com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter.internalExport(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification,com.android.tools.r8.StringConsumer):59:64 -> a
@@ -62550,9 +62744,9 @@
     1:2:java.util.Map mapToString(java.util.Map):169:170 -> b
     1:33:java.util.List rewritingFlagsToString(java.util.Map):85:117 -> c
     34:53:java.util.List rewritingFlagsToString(java.util.Map):115:134 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter$1 -> com.android.tools.r8.internal.CH:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter$1 -> com.android.tools.r8.internal.JH:
     1:1:void <init>(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationJsonExporter):80:80 -> <init>
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.EH:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.LH:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):21:21 -> <init>
     void lambda$parseMultiLevelConfiguration$0(com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder) -> b
     1:10:com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.MultiAPILevelHumanDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):27:36 -> b
@@ -62634,7 +62828,7 @@
     void holderType(com.android.tools.r8.graph.DexType) -> b
     void methodStart() -> b
     void returnType(com.android.tools.r8.graph.DexType) -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.memberparser.HumanFieldParser -> com.android.tools.r8.internal.Nn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.memberparser.HumanFieldParser -> com.android.tools.r8.internal.Sn:
     com.android.tools.r8.graph.FieldAccessFlags$Builder flagBuilder -> c
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexString fieldName -> f
@@ -62656,7 +62850,7 @@
     1:2:com.android.tools.r8.graph.DexField getField():33:34 -> c
     1:2:com.android.tools.r8.graph.FieldAccessFlags getFlags():38:39 -> d
     1:1:boolean parsingFinished():29:29 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.memberparser.HumanMethodParser -> com.android.tools.r8.internal.On:
+com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.memberparser.HumanMethodParser -> com.android.tools.r8.internal.Tn:
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexString methodName -> f
     com.android.tools.r8.graph.DexMethod method -> h
@@ -62677,7 +62871,7 @@
     3:4:void returnType(com.android.tools.r8.graph.DexType):84:85 -> c
     1:2:com.android.tools.r8.graph.DexMethod getMethod():37:38 -> d
     1:1:boolean parsingFinished():33:33 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.MC:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.SC:
     com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags rewritingFlags -> c
     boolean libraryCompilation -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags topLevelFlags -> b
@@ -62693,7 +62887,7 @@
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags getRewritingFlags():56:56 -> g
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags getTopLevelFlags():52:52 -> h
     1:1:boolean isEmpty():43:43 -> isEmpty
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.NC:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.TC:
     com.android.tools.r8.com.google.gson.JsonObject jsonConfig -> f
     com.android.tools.r8.utils.SemanticVersion MIN_SUPPORTED_VERSION -> g
     com.android.tools.r8.origin.Origin origin -> e
@@ -62748,7 +62942,7 @@
     4:8:java.lang.String parseJson(com.android.tools.r8.StringResource):138:142 -> b
     1:2:com.android.tools.r8.origin.Origin getOrigin():88:89 -> c
     1:1:com.android.tools.r8.utils.Reporter reporter():80:80 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags -> com.android.tools.r8.internal.OC:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags -> com.android.tools.r8.internal.UC:
     java.util.Map rewritePrefix -> a
     java.util.Set dontRetargetLibMember -> g
     java.util.Map emulateLibraryInterface -> b
@@ -62771,7 +62965,7 @@
     1:1:java.util.Map getRewritePrefix():91:91 -> g
     1:1:java.util.Set getWrapperConversions():119:119 -> h
     1:3:boolean isEmpty():123:125 -> i
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder -> com.android.tools.r8.internal.OC$a:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder -> com.android.tools.r8.internal.UC$a:
     java.util.Map rewritePrefix -> d
     java.util.Set dontRetargetLibMember -> j
     com.android.tools.r8.origin.Origin origin -> c
@@ -62835,7 +63029,7 @@
     14:14:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putRetargetCoreLibMember(java.lang.String,java.lang.String):240 -> d
     15:15:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):290:290 -> d
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyRewritingFlags$Builder putRewritePrefix(java.lang.String,java.lang.String):202:202 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags -> com.android.tools.r8.internal.RC:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags -> com.android.tools.r8.internal.XC:
     java.util.List extraKeepRules -> f
     boolean supportAllCallbacksFromLibrary -> e
     java.lang.String identifier -> c
@@ -62850,7 +63044,7 @@
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():75:75 -> e
     1:1:boolean supportAllCallbacksFromLibrary():87:87 -> f
     1:7:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags testing():57:63 -> g
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder -> com.android.tools.r8.internal.QC:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder -> com.android.tools.r8.internal.WC:
     java.util.List extraKeepRules -> f
     boolean supportAllCallbacksFromLibrary -> e
     java.lang.String identifier -> c
@@ -62868,7 +63062,7 @@
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setJsonSource(java.lang.String):122:122 -> b
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setSupportAllCallbacksFromLibrary(boolean):128:128 -> b
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags$Builder setSynthesizedLibraryClassesPackagePrefix(java.lang.String):112:112 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.FH:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification -> com.android.tools.r8.internal.MH:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap commonFlags -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap libraryFlags -> d
@@ -62880,12 +63074,12 @@
     1:1:com.android.tools.r8.origin.Origin getOrigin():32:32 -> c
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap getProgramFlags():48:48 -> d
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyTopLevelFlags getTopLevelFlags():36:36 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.GH:
+com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecificationParser -> com.android.tools.r8.internal.NH:
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):20:20 -> <init>
     1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap parseAllFlags(java.lang.String):39:51 -> a
     void lambda$parseMultiLevelConfiguration$0(com.android.tools.r8.ir.desugar.desugaredlibrary.TopLevelFlagsBuilder) -> c
     1:10:com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.MultiAPILevelLegacyDesugaredLibrarySpecification parseMultiLevelConfiguration(com.android.tools.r8.StringResource):26:35 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor -> com.android.tools.r8.internal.ze:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor -> com.android.tools.r8.internal.Ce:
     com.android.tools.r8.graph.DexMethod from -> b
     com.android.tools.r8.graph.DexMethod to -> a
     boolean $assertionsDisabled -> c
@@ -62893,7 +63087,7 @@
     1:5:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):13:17 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getFrom():25:25 -> a
     1:1:com.android.tools.r8.graph.DexMethod getTo():21:21 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod -> com.android.tools.r8.internal.Rf:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod -> com.android.tools.r8.internal.Vf:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind holderKind -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):28:30 -> <init>
@@ -62902,7 +63096,7 @@
     1:1:com.android.tools.r8.graph.DexMethod getMethod():42:42 -> c
     1:1:com.android.tools.r8.graph.DexString getName():46:46 -> d
     1:1:com.android.tools.r8.graph.DexProto getProto():50:50 -> e
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor -> com.android.tools.r8.internal.Ki:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor -> com.android.tools.r8.internal.Oi:
     java.util.LinkedHashMap dispatchCases -> d
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod emulatedDispatchMethod -> b
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod interfaceMethod -> a
@@ -62912,13 +63106,13 @@
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getEmulatedDispatchMethod():60:60 -> b
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getForwardingMethod():64:64 -> c
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod getInterfaceMethod():56:56 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor -> com.android.tools.r8.internal.Mi:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor -> com.android.tools.r8.internal.Qi:
     java.util.Map emulatedMethods -> b
     com.android.tools.r8.graph.DexType rewrittenType -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,java.util.Map):16:18 -> <init>
     1:1:java.util.Map getEmulatedMethods():26:26 -> a
     1:1:com.android.tools.r8.graph.DexType getRewrittenType():22:22 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification -> com.android.tools.r8.internal.WE:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification -> com.android.tools.r8.internal.dF:
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags rewritingFlags -> c
     com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags topLevelFlags -> b
     int leadingVersionNumberCache -> d
@@ -62988,10 +63182,10 @@
     1:5:boolean includesJDK11Methods():224 -> x
     1:1:boolean isEmpty():56:56 -> y
     1:1:boolean isLibraryCompilation():60:60 -> z
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.VE:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification$1 -> com.android.tools.r8.internal.cF:
     1:1:void <init>(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags):30:30 -> <init>
     boolean isSupported(com.android.tools.r8.graph.DexReference) -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags -> com.android.tools.r8.internal.YE:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags -> com.android.tools.r8.internal.fF:
     java.util.Map amendLibraryField -> q
     java.util.Map legacyBackport -> m
     java.util.Map customConversions -> o
@@ -63041,7 +63235,7 @@
     1:1:boolean hasEmulatedInterfaces():207:207 -> s
     1:5:boolean hasRetargeting():194:198 -> t
     1:6:boolean isEmpty():219:224 -> u
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder -> com.android.tools.r8.internal.XE:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder -> com.android.tools.r8.internal.eF:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder dontRetarget -> n
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder amendLibraryField -> q
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder maintainType -> b
@@ -63081,7 +63275,7 @@
     6:7:void maintainType(com.android.tools.r8.graph.DexType):269:270 -> c
     8:8:void putNonEmulatedVirtualRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):290:290 -> c
     1:1:void putStaticRetarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):286:286 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags -> com.android.tools.r8.internal.ZE:
+com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineTopLevelFlags -> com.android.tools.r8.internal.gF:
     java.lang.String identifier -> c
     java.lang.String synthesizedLibraryClassesPackagePrefix -> b
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> a
@@ -63091,7 +63285,7 @@
     1:1:com.android.tools.r8.utils.AndroidApiLevel getRequiredCompilationAPILevel():48:48 -> b
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():52:52 -> c
     1:1:boolean supportAllCallbacksFromLibrary():64:64 -> d
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.kg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.og:
     java.util.Map staticFieldRetarget -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map covariantRetarget -> d
@@ -63162,7 +63356,7 @@
     106:106:com.android.tools.r8.graph.DexMethod lambda$computeNonStaticRetarget$1(boolean,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):222:222 -> a
     107:110:com.android.tools.r8.graph.DexMethod lambda$computeNonStaticRetarget$2(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):228:228 -> a
     1:1:com.android.tools.r8.graph.DexMethod lambda$ensureInvokeRetargetingResult$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):138:138 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult -> com.android.tools.r8.internal.jg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult -> com.android.tools.r8.internal.ng:
     java.util.function.BiFunction newInvokeTargetSupplier -> b
     boolean hasNewInvokeTarget -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeter$InvokeRetargetingResult NO_REWRITING -> c
@@ -63176,22 +63370,22 @@
     3:3:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):171 -> a
     4:5:com.android.tools.r8.graph.DexMethod getNewInvokeTarget(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):171:172 -> a
     com.android.tools.r8.graph.DexMethod lambda$static$0(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer -> com.android.tools.r8.internal.lg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer -> com.android.tools.r8.internal.pg:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():14:14 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):31:33 -> <init>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView):20:20 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView):20 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     3:3:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView):20 -> a
     4:12:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView):20:28 -> a
     13:17:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):45:49 -> a
     1:1:java.lang.String uniqueIdentifier():38:38 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.mg:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor -> com.android.tools.r8.internal.qg:
     java.util.Map emulatedDispatchMethods -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper syntheticHelper -> b
@@ -63199,17 +63393,17 @@
     1:1:void <clinit>():33:33 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.AppView):39:43 -> <init>
     1:1:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52:52 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     2:2:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     3:3:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52 -> a
     4:5:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52:53 -> a
     6:6:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     7:7:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     8:8:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59 -> a
     9:9:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
     10:10:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():431:431 -> a
@@ -63236,7 +63430,7 @@
     48:54:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):172:178 -> a
     48:54:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Map):98 -> a
     48:54:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
-    55:55:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    55:55:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     55:55:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):180 -> a
     55:55:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Map):98 -> a
     55:55:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):79 -> a
@@ -63273,10 +63467,10 @@
     98:100:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):80 -> a
     101:102:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterPostProcessor.ensureInterfacesAndForwardingMethodsSynthesized(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,java.util.List):142:143 -> a
     101:102:void lambda$ensureInterfacesAndForwardingMethodsSynthesized$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.List):80 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.ng:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer -> com.android.tools.r8.internal.rg:
     void acceptDesugaredLibraryRetargeterDispatchClasspathClass(com.android.tools.r8.graph.DexClasspathClass) -> a
     void acceptCovariantRetargetMethod(com.android.tools.r8.graph.ProgramMethod) -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.og:
+com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper -> com.android.tools.r8.internal.sg:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -63301,10 +63495,10 @@
     69:70:com.android.tools.r8.graph.DexMethod emulatedHolderDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):112:113 -> a
     71:71:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$emulatedHolderDispatchMethod$6(com.android.tools.r8.synthesis.SyntheticNaming):111:111 -> a
     72:77:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):132:137 -> a
-    78:78:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    78:78:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     78:78:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):137 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    79:79:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    79:79:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     79:79:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):137 -> a
     80:102:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):138:160 -> a
     103:113:com.android.tools.r8.graph.DexMethod ensureEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):154:164 -> a
@@ -63313,10 +63507,10 @@
     116:116:void lambda$ensureProgramEmulatedHolderDispatchMethod$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):183:183 -> a
     117:117:void lambda$ensureEmulatedInterfaceDispatchMethod$15(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):206:206 -> a
     118:118:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):213:213 -> a
-    119:119:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    119:119:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     119:119:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):213 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    120:120:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    120:120:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     120:120:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):213 -> a
     121:132:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):213:224 -> a
     133:133:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):219:219 -> a
@@ -63328,10 +63522,10 @@
     151:151:void lambda$buildHolderDispatchMethod$20(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):258:258 -> a
     152:160:void lambda$buildHolderDispatchMethod$20(com.android.tools.r8.synthesis.SyntheticClassBuilder,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):257:265 -> a
     161:161:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$19(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexMethod):267:267 -> a
-    162:162:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    162:162:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     162:162:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$19(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexMethod):267 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    163:163:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    163:163:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     163:163:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$19(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer,com.android.tools.r8.graph.DexMethod):267 -> a
     164:165:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.forwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):94:95 -> a
     164:165:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.ensureForwardingMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):101 -> a
@@ -63351,18 +63545,18 @@
     4:4:com.android.tools.r8.graph.DexMethod emulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):118:118 -> b
     5:5:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$emulatedInterfaceDispatchMethod$7(com.android.tools.r8.synthesis.SyntheticNaming):117:117 -> b
     6:7:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):171:172 -> b
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> b
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> b
     8:8:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):172 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> b
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> b
     9:9:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):172 -> b
     10:22:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):172:184 -> b
     23:23:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):179:179 -> b
     24:27:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):190:193 -> b
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> b
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> b
     28:28:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):193 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    29:29:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> b
+    29:29:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> b
     29:29:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):193 -> b
     30:43:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):194:207 -> b
     44:44:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):202:202 -> b
@@ -63380,7 +63574,7 @@
     8:15:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.AppForSpecConversion.internalReadApp(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing):41:48 -> a
     8:15:com.android.tools.r8.graph.DexApplication readAppForTesting(java.util.Collection,java.util.Collection,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.utils.Timing):34 -> a
     16:16:com.android.tools.r8.graph.DexApplication readAppForTesting(java.util.Collection,java.util.Collection,com.android.tools.r8.utils.InternalOptions,boolean,com.android.tools.r8.utils.Timing):35:35 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter -> com.android.tools.r8.internal.Qn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineEmulatedInterfaceConverter -> com.android.tools.r8.internal.Vn:
     java.util.Map emulatedInterfaceHierarchy -> b
     java.util.Set missingEmulatedInterface -> c
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
@@ -63449,7 +63643,7 @@
     114:120:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set):177:183 -> a
     121:122:void com.android.tools.r8.utils.WorkList.addIfNotSeen(java.lang.Object[]):82:83 -> a
     121:122:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexType,java.util.Set):183 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter -> com.android.tools.r8.internal.Rn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter -> com.android.tools.r8.internal.Wn:
     java.util.Set descriptorDontRewritePrefix -> g
     java.util.Set usedPrefix -> i
     java.util.Set descriptorMaintainPrefix -> f
@@ -63537,7 +63731,7 @@
     79:85:void lambda$registerDifferentType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):140:146 -> a
     86:86:void lambda$registerDifferentType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):144:144 -> a
     87:89:com.android.tools.r8.graph.DexString prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):152:154 -> a
-    90:90:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    90:90:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     90:90:com.android.tools.r8.graph.DexString prefixMatching(com.android.tools.r8.graph.DexType,java.util.Set):154 -> a
     91:97:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.rewrittenType(com.android.tools.r8.graph.DexType):162:168 -> a
     91:97:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachinePrefixConverter.registerType(com.android.tools.r8.graph.DexType):113 -> a
@@ -63607,7 +63801,7 @@
     28:28:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):194 -> b
     29:31:com.android.tools.r8.com.google.common.collect.ImmutableMap convertRewritePrefix(java.util.Map):194:196 -> b
     1:1:void rewriteEmulatedInterface(java.util.Map):89:89 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter -> com.android.tools.r8.internal.Sn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter -> com.android.tools.r8.internal.Xn:
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
     java.util.Set missingReferences -> b
     boolean $assertionsDisabled -> c
@@ -63645,10 +63839,10 @@
     72:98:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertCovariantRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):107:133 -> a
     72:98:void lambda$convertRetargetFlags$1(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):46 -> a
     99:99:boolean seemsToNeedEmulatedDispatch(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):162:162 -> a
-    100:100:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> a
+    100:100:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> a
     100:100:boolean seemsToNeedEmulatedDispatch(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):163 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    101:101:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> a
+    101:101:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> a
     101:101:boolean seemsToNeedEmulatedDispatch(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):163 -> a
     102:102:boolean seemsToNeedEmulatedDispatch(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):163:163 -> a
     103:114:boolean isEmulatedInterfaceDispatch(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags):199:210 -> a
@@ -63672,7 +63866,7 @@
     22:22:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):245:245 -> b
     23:25:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineRetargetConverter.convertNonEmulatedRetarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiConsumer):225:227 -> b
     23:25:void convertStaticRetarget(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):245 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter -> com.android.tools.r8.internal.Tn:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter -> com.android.tools.r8.internal.Yn:
     java.util.Set missingCustomConversions -> c
     com.android.tools.r8.utils.Timing timing -> d
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> a
@@ -63698,7 +63892,7 @@
     1:2:void warnMissingReferences(java.lang.String,java.util.Set):147:148 -> b
     3:6:void com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineSpecificationConverter.warn(java.lang.String,java.util.List):159:162 -> b
     3:6:void warnMissingReferences(java.lang.String,java.util.Set):149 -> b
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter -> com.android.tools.r8.internal.Un:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter -> com.android.tools.r8.internal.Zn:
     java.util.Set missingClasses -> c
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
@@ -63721,7 +63915,7 @@
     71:73:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.HumanToMachineWrapperConverter.allImplementedMethods(com.android.tools.r8.graph.DexClass,java.util.Set):105:107 -> a
     71:73:void lambda$convertWrappers$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,java.util.Set):53 -> a
     74:76:void lambda$convertWrappers$0(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineRewritingFlags$Builder,com.android.tools.r8.graph.DexType,java.util.Set):54:56 -> a
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter -> com.android.tools.r8.internal.PC:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LegacyToHumanSpecificationConverter -> com.android.tools.r8.internal.VC:
     com.android.tools.r8.utils.AndroidApiLevel LEGACY_HACK_LEVEL -> d
     java.util.Set missingMethods -> c
     com.android.tools.r8.utils.Timing timing -> a
@@ -63789,10 +63983,10 @@
     794:794:void lambda$convertRetargetCoreLibMember$5(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):288:288 -> a
     795:795:void lambda$convertRetargetCoreLibMember$5(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):288:288 -> a
     775:785:void lambda$convertRetargetCoreLibMember$5(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):288:298 -> a
-    786:786:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> a
+    786:786:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> a
     786:786:void lambda$convertRetargetCoreLibMember$5(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):298 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    787:787:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> a
+    787:787:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> a
     787:787:void lambda$convertRetargetCoreLibMember$5(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):298 -> a
     788:788:void lambda$convertRetargetCoreLibMember$5(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):302:302 -> a
     789:789:void lambda$convertRetargetCoreLibMember$5(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):301:301 -> a
@@ -63821,7 +64015,7 @@
     268:268:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):261:261 -> b
     265:265:void lambda$rewritePrefix$4(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):261:261 -> b
     1:17:void rewritePrefix(com.android.tools.r8.ir.desugar.desugaredlibrary.humanspecification.HumanRewritingFlags$Builder,java.lang.String,java.lang.String):249:265 -> c
-com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LibraryValidator -> com.android.tools.r8.internal.nD:
+com.android.tools.r8.ir.desugar.desugaredlibrary.specificationconversion.LibraryValidator -> com.android.tools.r8.internal.tD:
     1:14:void validate(com.android.tools.r8.graph.DexApplication,boolean,com.android.tools.r8.utils.AndroidApiLevel):25:38 -> a
     15:15:void validate(com.android.tools.r8.graph.DexApplication,boolean,com.android.tools.r8.utils.AndroidApiLevel):32:32 -> a
 com.android.tools.r8.ir.desugar.icce.AlwaysThrowingInstructionDesugaring -> com.android.tools.r8.internal.L1:
@@ -63849,7 +64043,7 @@
     90:112:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer):172:194 -> a
     113:120:java.util.Collection getThrowInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer):191:198 -> a
     121:135:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer getMethodSynthesizerForThrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramMethod):209:223 -> a
-com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.mw:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo -> com.android.tools.r8.internal.sw:
     com.android.tools.r8.graph.CfCode virtualMethodCode -> d
     com.android.tools.r8.graph.ProgramMethod newDirectMethod -> b
     com.android.tools.r8.graph.ProgramMethod virtualMethod -> c
@@ -63869,7 +64063,7 @@
     4:4:int compareTo(java.lang.Object):10 -> compareTo
     5:5:int com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo.compareTo(com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialBridgeInfo):37:37 -> compareTo
     5:5:int compareTo(java.lang.Object):10 -> compareTo
-com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring -> com.android.tools.r8.internal.nw:
+com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring -> com.android.tools.r8.internal.tw:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
     1:2:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):41:42 -> a
@@ -63928,7 +64122,7 @@
     57:57:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.ensureInvokeSpecialBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer):130:130 -> a
     57:57:java.util.List com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaring.desugarInvokeInstruction(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.invokespecial.InvokeSpecialToSelfDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):102 -> a
     57:57:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.Za:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor -> com.android.tools.r8.internal.cb:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> c
@@ -63958,7 +64152,7 @@
     25:31:void lambda$resolveForwardingMethods$8(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):678 -> a
     32:32:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):817:817 -> a
     32:32:void lambda$resolveForwardingMethods$8(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):678 -> a
-    33:33:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    33:33:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     33:33:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):820 -> a
     33:33:void lambda$resolveForwardingMethods$8(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod):678 -> a
     34:35:void com.android.tools.r8.ir.desugar.itf.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):820:821 -> a
@@ -64227,7 +64421,7 @@
     18:18:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):936:936 -> d
     19:19:java.lang.Object com.android.tools.r8.ir.desugar.itf.ClassProcessor.reentrantComputeIfAbsent(java.util.Map,com.android.tools.r8.graph.DexClass,java.util.function.Function):869:869 -> d
     19:19:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo visitInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext):936 -> d
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.Sa:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.Va:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo parent -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo EMPTY -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardedMethodTargets -> b
@@ -64236,7 +64430,7 @@
     1:4:void <init>(com.android.tools.r8.ir.desugar.itf.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):129:132 -> <init>
     1:5:boolean isTargetedByForwards(com.android.tools.r8.graph.DexClassAndMethod):149:153 -> a
     6:6:boolean lambda$isTargetedByForwards$0(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexEncodedMethod):152:152 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.Ta:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.Wa:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures signatures -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces emulatedInterfaces -> b
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo EMPTY -> c
@@ -64263,21 +64457,21 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     18:18:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces.isEmpty():233:233 -> a
     18:18:boolean isEmpty():285 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.Ua:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces -> com.android.tools.r8.internal.Xa:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces EMPTY -> b
     java.util.Set emulatedInterfaces -> a
     1:1:void <clinit>():220:220 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexType):224:225 -> <init>
     3:4:void <init>(java.util.Set):228:229 -> <init>
     1:4:com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaces):245:248 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.Va:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.Ya:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> d
     1:1:void <clinit>():330:330 -> <clinit>
     1:1:void <init>():333:333 -> <init>
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass) -> a
     void reportMissingType(com.android.tools.r8.graph.DexType) -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):343:343 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.Wa:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.Za:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures EMPTY -> b
     java.util.Set signatures -> a
     1:1:void <clinit>():73:73 -> <clinit>
@@ -64290,7 +64484,7 @@
     3:3:boolean com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures.isEmpty():98:98 -> a
     3:3:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):89 -> a
     4:6:com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures):92:94 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.Xa:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.ab:
     com.android.tools.r8.graph.DexClass directSubClass -> a
     com.android.tools.r8.graph.DexProgramClass closestProgramSubClass -> b
     java.util.function.BiConsumer reportMissingTypeCallback -> c
@@ -64300,7 +64494,7 @@
     7:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppInfo.definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):169:174 -> a
     7:12:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):319 -> a
     13:13:void reportMissingType(com.android.tools.r8.graph.DexType):323:323 -> a
-com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.Ya:
+com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.bb:
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo EMPTY -> c
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$MethodSignatures signatures -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo emulatedInterfaceInfo -> b
@@ -64337,7 +64531,7 @@
     12:12:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):184 -> a
     13:15:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo merge(com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo):187:189 -> a
     16:20:com.android.tools.r8.ir.desugar.itf.ClassProcessor$SignaturesInfo withEmulatedInterfaceInfo(com.android.tools.r8.ir.desugar.itf.ClassProcessor$EmulatedInterfaceInfo):210:214 -> a
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.zf:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper -> com.android.tools.r8.internal.Df:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
@@ -64345,7 +64539,7 @@
     3:8:void hideMatches(com.android.tools.r8.graph.DexMethod):65:70 -> a
     9:9:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
     10:13:com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection wrapInCollection():81:84 -> a
-com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.yf:
+com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.Cf:
     java.util.List hidden -> b
     java.util.List live -> a
     com.android.tools.r8.ir.desugar.itf.DefaultMethodsHelper$Collection EMPTY -> c
@@ -64355,7 +64549,7 @@
     1:1:java.util.List access$000(com.android.tools.r8.ir.desugar.itf.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.itf.DefaultMethodsHelper$Collection):28:28 -> b
-com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter -> com.android.tools.r8.internal.Li:
+com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter -> com.android.tools.r8.internal.Pi:
     java.util.Map emulatedInterfaces -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -64363,39 +64557,39 @@
     1:8:void <init>(com.android.tools.r8.graph.AppView):28:35 -> <init>
     1:1:void lambda$new$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):37:37 -> a
     2:2:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):42:42 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     3:3:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):42 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     4:4:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):42 -> a
     5:8:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):42:45 -> a
     9:15:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):57:63 -> a
     9:15:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
-    16:19:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):119:122 -> a
+    16:19:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):120:123 -> a
     16:19:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):63 -> a
     16:19:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
     20:20:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):64:64 -> a
     20:20:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
-    21:24:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):119:122 -> a
+    21:24:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):120:123 -> a
     21:24:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):64 -> a
     21:24:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
     25:33:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):65:73 -> a
     25:33:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
-    34:34:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    34:34:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     34:34:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):74 -> a
     34:34:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
-    35:49:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):75:89 -> a
-    35:49:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
-    50:65:java.util.List com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.getRewrittenInterfacesOfEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):97:112 -> a
-    50:65:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):91 -> a
-    50:65:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
-    66:66:java.util.List com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.getRewrittenInterfacesOfEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):111:111 -> a
-    66:66:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):91 -> a
-    66:66:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
-    67:67:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):90:90 -> a
+    35:50:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):75:90 -> a
+    35:50:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
+    51:66:java.util.List com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.getRewrittenInterfacesOfEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):98:113 -> a
+    51:66:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):92 -> a
+    51:66:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
+    67:67:java.util.List com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.getRewrittenInterfacesOfEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):112:112 -> a
+    67:67:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):92 -> a
     67:67:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
-    68:73:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46:51 -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringForTesting -> com.android.tools.r8.internal.cv:
+    68:68:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceApplicationRewriter.rewriteEmulatedInterface(com.android.tools.r8.graph.DexProgramClass):91:91 -> a
+    68:68:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46 -> a
+    69:74:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):46:51 -> a
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringForTesting -> com.android.tools.r8.internal.iv:
     1:1:java.lang.String getCompanionClassNameSuffix():16:16 -> a
     2:2:java.lang.String getCompanionClassDescriptor(java.lang.String):28:28 -> a
     3:3:java.lang.String com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.getCompanionClassDescriptor(java.lang.String):149:149 -> a
@@ -64403,7 +64597,7 @@
     1:1:java.lang.String getDefaultMethodPrefix():20:20 -> b
     1:1:java.lang.String getEmulateLibraryClassNameSuffix():12:12 -> c
     1:1:java.lang.String getPrivateMethodPrefix():24:24 -> d
-com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper -> com.android.tools.r8.internal.dv:
+com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper -> com.android.tools.r8.internal.jv:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.cf.CfVersion MAX_INTERFACE_DESUGARED_CF_VERSION -> c
     java.util.function.Predicate shouldIgnoreFromReportsPredicate -> b
@@ -64413,10 +64607,10 @@
     void lambda$ensureEmulatedInterfaceDispatchMethod$8(com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder) -> a
     void lambda$ensureEmulatedInterfaceMarkerInterface$2(com.android.tools.r8.graph.DexClasspathClass) -> a
     1:1:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):97:97 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     2:2:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):97 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):97 -> a
     4:15:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):97:108 -> a
     16:30:boolean isCompatibleDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):112:126 -> a
@@ -64438,10 +64632,10 @@
     74:74:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     74:74:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):283 -> a
     75:75:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):284:284 -> a
-    76:76:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    76:76:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     76:76:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):284 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    77:77:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    77:77:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     77:77:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):284 -> a
     78:84:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):284:290 -> a
     85:97:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):288:300 -> a
@@ -64558,10 +64752,10 @@
     69:69:void lambda$ensureCompanionClassInitializesInterface$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):503:503 -> b
     70:70:boolean lambda$hasStaticMethodThatTriggersNonTrivialClassInitializer$26(com.android.tools.r8.graph.DexEncodedMethod):522:522 -> b
     71:71:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):530:530 -> b
-    72:72:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):383:383 -> b
+    72:72:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):388:388 -> b
     72:72:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):530 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    73:73:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):383:383 -> b
+    73:73:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):388:388 -> b
     73:73:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):530 -> b
     74:74:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):530:530 -> b
     void lambda$ensureDefaultAsMethodOfProgramCompanionClassStub$13(com.android.tools.r8.graph.ProgramMethod) -> c
@@ -64579,10 +64773,10 @@
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureEmulatedInterfaceForwardingMethod$3(com.android.tools.r8.synthesis.SyntheticNaming):264:264 -> f
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureEmulatedInterfaceMarkerInterface$1(com.android.tools.r8.synthesis.SyntheticNaming):185:185 -> g
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$ensureMethodOfClasspathCompanionClassStub$17(com.android.tools.r8.synthesis.SyntheticNaming):440:440 -> h
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer -> com.android.tools.r8.internal.fv:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodDesugaringBaseEventConsumer -> com.android.tools.r8.internal.lv:
     void acceptCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
     void acceptCompanionClassClinit(com.android.tools.r8.graph.ProgramMethod) -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade -> com.android.tools.r8.internal.gv:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade -> com.android.tools.r8.internal.mv:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.itf.ClassProcessor classProcessor -> d
     com.android.tools.r8.ir.desugar.itf.InterfaceProcessor interfaceProcessor -> c
@@ -64595,7 +64789,7 @@
     7:7:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):64:64 -> a
     1:3:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):50:50 -> b
     7:8:void processClassesConcurrently(java.util.Collection,com.android.tools.r8.ir.desugar.itf.InterfaceProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):54:55 -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.iv:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter -> com.android.tools.r8.internal.ov:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> d
     com.android.tools.r8.graph.DexItemFactory factory -> c
     java.util.Set precedingDesugarings -> h
@@ -64651,7 +64845,7 @@
     689:689:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):494 -> a
     690:693:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):835:838 -> a
     690:693:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):494 -> a
-    694:694:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    694:694:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     694:694:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):838 -> a
     694:694:com.android.tools.r8.ir.desugar.DesugarDescription computeInvokeDirect(com.android.tools.r8.graph.DexClass,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):494 -> a
     695:695:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
@@ -64796,23 +64990,23 @@
     914:914:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):910 -> a
     915:918:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):835:838 -> a
     915:918:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):910 -> a
-    919:919:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    919:919:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     919:919:com.android.tools.r8.origin.Origin com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.getMethodOrigin(com.android.tools.r8.graph.DexMethod):838 -> a
     919:919:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):910 -> a
     920:921:void warnMissingType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):911:912 -> a
     922:924:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):917:919 -> a
-    925:925:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    925:925:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     925:925:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):921 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     926:927:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):923:924 -> a
-    928:928:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    928:928:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     928:928:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):936 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     928:928:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):925 -> a
     929:929:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):938:938 -> a
     929:929:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):925 -> a
     930:931:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):927:928 -> a
-    932:932:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    932:932:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     932:932:void com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):936 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     932:932:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfo):928 -> a
@@ -64874,10 +65068,10 @@
     28:97:com.android.tools.r8.ir.desugar.DesugarDescription rewriteInvokeSuper(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.graph.ProgramMethod):649:718 -> c
     1:3:java.util.Collection lambda$computeInvokeStatic$11(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.graph.DexItemFactory):429:431 -> d
     4:4:void lambda$rewriteInvokeSuper$18(com.android.tools.r8.graph.ProgramMethod):722:722 -> d
-    5:5:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> d
+    5:5:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> d
     5:5:void lambda$rewriteInvokeSuper$18(com.android.tools.r8.graph.ProgramMethod):723 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> d
+    6:6:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> d
     6:6:void lambda$rewriteInvokeSuper$18(com.android.tools.r8.graph.ProgramMethod):723 -> d
     7:7:void lambda$rewriteInvokeSuper$18(com.android.tools.r8.graph.ProgramMethod):723:723 -> d
     8:8:void lambda$rewriteInvokeSuper$18(com.android.tools.r8.graph.ProgramMethod):0:0 -> d
@@ -64891,12 +65085,12 @@
     6:6: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 -> e
     6:6:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):600 -> e
     7:10:void leavingStaticInvokeToInterface(com.android.tools.r8.graph.ProgramMethod):599:602 -> e
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.hv:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.nv:
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor ExcludeDexResources -> c
     com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter$Flavor IncludeAllResources -> b
     1:3:void <clinit>():106:108 -> <clinit>
     1:1:void <init>(java.lang.String,int):104:104 -> <init>
-com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.jv:
+com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.pv:
     com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens graphLens -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens):17:19 -> <init>
@@ -64914,7 +65108,7 @@
     20:20:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriterFixup.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):44:44 -> a
     20:20:void run():33 -> a
     21:21:void run():32:32 -> a
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.internal.nv:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor -> com.android.tools.r8.internal.tv:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> b
     java.util.Map postProcessingInterfaceInfos -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -65009,7 +65203,7 @@
     2:2:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():428:428 -> c
     2:2:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():259 -> c
     3:29:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens postProcessInterfaces():260:286 -> c
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.lv:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.rv:
     int $r8$clinit -> o
     com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap extraNewMethodSignatures -> n
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap,java.util.Map,com.android.tools.r8.utils.collections.BidirectionalOneToOneMap):401:402 -> <init>
@@ -65032,12 +65226,12 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.graph.DexMethod getNextMethodSignature(com.android.tools.r8.graph.DexMethod):423:423 -> f
     1:1:com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap getExtraNewMethodSignatures():407:407 -> n
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.kv:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.qv:
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap extraNewMethodSignatures -> d
     1:3:void <init>():431:433 -> <init>
     1:4:com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$InterfaceProcessorNestedGraphLens build(com.android.tools.r8.graph.AppView):442:445 -> a
     1:1:void recordCodeMovedToCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):437:437 -> b
-com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.mv:
+com.android.tools.r8.ir.desugar.itf.InterfaceProcessor$PostProcessingInterfaceInfo -> com.android.tools.r8.internal.sv:
     java.util.Map defaultMethodsToImplementation -> a
     java.util.Map methodsToMove -> b
     boolean hasNonClinitDirectMethods -> c
@@ -65054,7 +65248,7 @@
     1:1:boolean hasNonClinitDirectMethods():371:371 -> f
     1:1:void setHasBridgesToRemove():383:383 -> g
     1:1:void setHasNonClinitDirectMethods():375:375 -> h
-com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.cP:
+com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer -> com.android.tools.r8.internal.uP:
     com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper helper -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -65077,10 +65271,10 @@
     43:46:java.util.LinkedHashMap resolveDispatchCases(com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedDispatchMethodDescriptor):105:108 -> a
     47:49:void lambda$resolveDispatchCases$6(java.util.LinkedHashMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.DerivedMethod):110:110 -> a
     50:50:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):124:124 -> a
-    51:51:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    51:51:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     51:51:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):124 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    52:52:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    52:52:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     52:52:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):124 -> a
     53:58:void synthesizeClasses(com.android.tools.r8.contexts.CompilationContext$ClassSynthesisDesugaringContext,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):124:129 -> a
     59:68:void lambda$synthesizeClasses$7(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):131:140 -> a
@@ -65098,22 +65292,22 @@
     71:73:void lambda$synthesizeClasses$7(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor):133 -> a
     1:1:void synthesizeEmulateInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.EmulatedInterfaceDescriptor,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):63:63 -> b
     2:2:java.lang.String uniqueIdentifier():117:117 -> b
-com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.El:
+com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer -> com.android.tools.r8.internal.Jl:
     void lambda$emptyForcefullyMovedLambdaMethodConsumer$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod) -> a
     1:1:com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer emptyForcefullyMovedLambdaMethodConsumer():14:14 -> a
     void acceptForcefullyMovedLambdaMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod) -> b
-com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover -> com.android.tools.r8.internal.wC:
+com.android.tools.r8.ir.desugar.lambda.LambdaDeserializationMethodRemover -> com.android.tools.r8.internal.CC:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:4:void run(com.android.tools.r8.graph.AppView,java.util.Collection):24:27 -> a
-com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.android.tools.r8.internal.yC:
+com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring -> com.android.tools.r8.internal.EC:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set directTargetedLambdaImplementationMethods -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView):53:53 -> <init>
     2:10:void <init>(com.android.tools.r8.graph.AppView):46:54 -> <init>
     1:2:boolean isDirectTargetedLambdaImplementationMethod(com.android.tools.r8.graph.DexMethodHandle):49:50 -> a
     3:7:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):59:63 -> a
-    8:8:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    8:8:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     8:8:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):63 -> a
     9:9:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer):64:64 -> a
     10:10:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):80:80 -> a
@@ -65144,7 +65338,7 @@
     87:88:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):186 -> a
     89:89:boolean com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring.isLambdaInvoke(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):192:192 -> a
     89:89:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):186 -> a
-com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke -> com.android.tools.r8.internal.xC:
+com.android.tools.r8.ir.desugar.lambda.LambdaInstructionDesugaring$DesugarInvoke -> com.android.tools.r8.internal.DC:
     java.util.Collection desugarInvoke(com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator) -> a
 com.android.tools.r8.ir.desugar.nest.AccessBridgeFactory -> com.android.tools.r8.internal.y1:
     boolean $assertionsDisabled -> a
@@ -65171,7 +65365,7 @@
     27:31:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):86:90 -> b
     32:43:com.android.tools.r8.graph.ProgramMethod createMethodAccessorBridge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory):83:94 -> b
     44:44:void lambda$createMethodAccessorBridge$1(com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.ir.synthetic.ForwardMethodBuilder):89:89 -> b
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.Je:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.Ne:
     1:1:void <init>(com.android.tools.r8.graph.AppView):36:36 -> <init>
     void lambda$clearNestAttributes$3(com.android.tools.r8.graph.DexClass) -> a
     1:2:void lambda$clearNestAttributes$2(com.android.tools.r8.ir.desugar.nest.Nest):61:62 -> a
@@ -65198,64 +65392,64 @@
     1:8:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):42:49 -> b
     9:9:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):43:43 -> b
     10:10:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54:54 -> b
-    11:11:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1044:1044 -> b
+    11:11:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1020:1020 -> b
     11:11:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1044:1044 -> b
+    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1020:1020 -> b
     12:12:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    13:13:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> b
-    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1046 -> b
+    13:13:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> b
+    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1022 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     13:13:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1046:1046 -> b
+    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1022:1022 -> b
     14:14:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    15:15:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1050:1050 -> b
-    15:15:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1046 -> b
+    15:15:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1026:1026 -> b
+    15:15:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1022 -> b
     15:15:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
     16:16:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":21,"2":22,"3":23}}
-    21:21:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1051:1051 -> b
-    21:21:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1046 -> b
+    21:21:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1027:1027 -> b
+    21:21:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1022 -> b
     21:21:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    22:22:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1051:1051 -> b
-    22:22:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1046 -> b
+    22:22:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1027:1027 -> b
+    22:22:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1022 -> b
     22:22:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    23:23:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1051:1051 -> b
-    23:23:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1046 -> b
+    23:23:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1027:1027 -> b
+    23:23:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1022 -> b
     23:23:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    17:18:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1051:1052 -> b
-    17:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1046 -> b
+    17:18:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):1027:1028 -> b
+    17:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1022 -> b
     17:18:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    19:19:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1046:1046 -> b
+    19:19:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1022:1022 -> b
     19:19:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
-    20:20:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1044:1044 -> b
+    20:20:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):1020:1020 -> b
     20:20:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
     24:24:void clearNestAttributes():59:59 -> b
     25:25:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):106:106 -> b
-    26:26:void com.android.tools.r8.graph.DexClasspathClass.forEachClasspathMethod(java.util.function.Consumer):75:75 -> b
+    26:26:void com.android.tools.r8.graph.DexClasspathClass.forEachClasspathMethod(java.util.function.Consumer):77:77 -> b
     26:26:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):106 -> b
-    27:27:void com.android.tools.r8.graph.DexClasspathClass.forEachClasspathMethod(java.util.function.Consumer):75:75 -> b
+    27:27:void com.android.tools.r8.graph.DexClasspathClass.forEachClasspathMethod(java.util.function.Consumer):77:77 -> b
     27:27:void synthesizeBridgesForNestBasedAccessesOnClasspath(com.android.tools.r8.graph.DexClasspathClass,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):106 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:void reportDesugarDependencies():40:40 -> c
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.He:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$1 -> com.android.tools.r8.internal.Le:
     com.android.tools.r8.ir.conversion.MethodProcessor val$methodProcessor -> a
     1:1:void <init>(com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring,com.android.tools.r8.ir.conversion.MethodProcessor):81:81 -> <init>
     1:1:void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):85:85 -> d
     1:1:void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):95:95 -> e
     1:1:void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):90:90 -> f
-com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.Ie:
+com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.Me:
     com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring this$0 -> f
     com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer eventConsumer -> e
     1:3:void <init>(com.android.tools.r8.ir.desugar.nest.D8NestBasedAccessDesugaring,com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer):117:119 -> <init>
     1:2:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):123:124 -> a
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
     3:3:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):124 -> a
-    4:4:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):557:557 -> a
+    4:4:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):571:571 -> a
     4:4:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
     4:4:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):124 -> a
-    5:5:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):561:561 -> a
-    5:5:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):557 -> a
+    5:5:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):575:575 -> a
+    5:5:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):571 -> a
     5:5:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
     5:5:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):124 -> a
     6:7:void registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):125:126 -> a
@@ -65276,7 +65470,7 @@
     6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> h
     6:6:void registerInvoke(com.android.tools.r8.graph.DexMethod):135 -> h
     7:9:void registerInvoke(com.android.tools.r8.graph.DexMethod):135:137 -> h
-com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.qI:
+com.android.tools.r8.ir.desugar.nest.Nest -> com.android.tools.r8.internal.xI:
     com.android.tools.r8.graph.DexClass hostClass -> a
     java.util.List members -> b
     java.util.List missingMembers -> c
@@ -65290,7 +65484,7 @@
     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.sI:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring -> com.android.tools.r8.internal.zI:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map syntheticNestConstructorTypes -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -65361,12 +65555,12 @@
     128:128: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):78:78 -> a
     128:128:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod):210 -> a
     128:128:void prepareDesugarFieldInstruction(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):156 -> a
-    129:129:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):557:557 -> a
+    129:129:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):571:571 -> a
     129:129:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
     129:129:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod):211 -> a
     129:129:void prepareDesugarFieldInstruction(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):156 -> a
-    130:130:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):561:561 -> a
-    130:130:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):557 -> a
+    130:130:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):575:575 -> a
+    130:130:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):571 -> a
     130:130:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
     130:130:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod):211 -> a
     130:130:void prepareDesugarFieldInstruction(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.ProgramAdditions):156 -> a
@@ -65390,13 +65584,13 @@
     162:162:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod):210 -> a
     162:162: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.NestBasedAccessDesugaringEventConsumer):289 -> a
     162:162:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):274 -> a
-    163:163:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):557:557 -> a
+    163:163:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):571:571 -> a
     163:163:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
     163:163:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod):211 -> a
     163:163: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.NestBasedAccessDesugaringEventConsumer):289 -> a
     163:163:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):274 -> a
-    164:164:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):561:561 -> a
-    164:164:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):557 -> a
+    164:164:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):575:575 -> a
+    164:164:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):571 -> a
     164:164:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
     164:164:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring.bridgeAndTargetForDesugaring(com.android.tools.r8.graph.DexField,boolean,com.android.tools.r8.graph.ProgramMethod):211 -> a
     164:164: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.NestBasedAccessDesugaringEventConsumer):289 -> a
@@ -65502,7 +65696,7 @@
     326:332:com.android.tools.r8.graph.DexType lambda$getMethodBridgeReference$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexType):455:461 -> a
     333:333:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$getMethodBridgeReference$4(com.android.tools.r8.synthesis.SyntheticNaming):446:446 -> a
     1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$getMethodBridgeReference$6(com.android.tools.r8.synthesis.SyntheticNaming):456:456 -> b
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -> com.android.tools.r8.internal.rI:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring$BridgeAndTarget -> com.android.tools.r8.internal.yI:
     com.android.tools.r8.graph.DexClassAndMember target -> b
     com.android.tools.r8.graph.DexMethod bridge -> a
     boolean $assertionsDisabled -> c
@@ -65511,11 +65705,11 @@
     1:1:com.android.tools.r8.graph.DexMethod getBridge():114:114 -> a
     1:1:com.android.tools.r8.graph.DexClassAndMember getTarget():118:118 -> b
     1:1:boolean shouldAddBridge():122:122 -> c
-com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.tI:
+com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaringEventConsumer -> com.android.tools.r8.internal.AI:
     void acceptNestFieldGetBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod) -> d
     void acceptNestMethodBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> e
     void acceptNestFieldPutBridge(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod) -> f
-com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.internal.sS:
+com.android.tools.r8.ir.desugar.records.RecordCfMethods -> com.android.tools.r8.internal.NS:
     1:17:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):52:68 -> a
     18:21:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):66:69 -> a
     22:36:com.android.tools.r8.graph.CfCode RecordMethods_hashCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):64:78 -> a
@@ -65566,14 +65760,14 @@
     504:504:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):192:192 -> b
     504:504:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):174 -> b
     504:504:com.android.tools.r8.graph.CfCode RecordMethods_toString(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):313 -> b
-com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter -> com.android.tools.r8.internal.tS:
+com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter -> com.android.tools.r8.internal.OS:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):42:43 -> <init>
     1:2:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):34:35 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     3:3:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     4:4:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):35 -> a
     5:6:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):36:37 -> a
     7:7:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):49:49 -> a
@@ -65594,7 +65788,7 @@
     34:49:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):60 -> a
     50:50:com.android.tools.r8.cf.code.CfInvokeDynamic com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter.writeRecordInvokeDynamic(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic):97:97 -> a
     50:50:com.android.tools.r8.cf.code.CfInvokeDynamic rewriteRecordInvokeDynamic(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.naming.NamingLens):60 -> a
-com.android.tools.r8.ir.desugar.records.RecordDesugaring -> com.android.tools.r8.internal.xS:
+com.android.tools.r8.ir.desugar.records.RecordDesugaring -> com.android.tools.r8.internal.SS:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto recordToStringHelperProto -> c
@@ -65744,9 +65938,9 @@
     25:38:java.util.List desugarInvokeRecordToString(com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer$RecordInstructionDesugaringEventConsumer,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):343:356 -> b
     39:39:java.lang.String uniqueIdentifier():479:479 -> b
     1:1:com.android.tools.r8.errors.MissingGlobalSyntheticsConsumerDiagnostic lambda$ensureRecordClass$5():378:378 -> c
-com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.yS:
+com.android.tools.r8.ir.desugar.records.RecordDesugaringEventConsumer -> com.android.tools.r8.internal.TS:
     void acceptRecordClass(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter -> com.android.tools.r8.internal.DS:
+com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter -> com.android.tools.r8.internal.YS:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.conversion.IRConverter irConverter -> b
@@ -65814,7 +66008,7 @@
     72:72:void com.android.tools.r8.ir.desugar.records.RecordFieldValuesRewriter.rewriteRecordFieldValues(com.android.tools.r8.graph.ProgramMethod):86:86 -> a
     72:72:void rewriteRecordFieldValues():61 -> a
     73:90:void splitIfCatchHandlers(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):133:150 -> a
-com.android.tools.r8.ir.desugar.records.RecordRewriterHelper -> com.android.tools.r8.internal.FS:
+com.android.tools.r8.ir.desugar.records.RecordRewriterHelper -> com.android.tools.r8.internal.aT:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:31:boolean isInvokeDynamicOnRecord(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):33:63 -> a
@@ -65830,7 +66024,7 @@
     74:74:boolean com.android.tools.r8.ir.desugar.records.RecordRewriterHelper.isInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):28:28 -> a
     74:74:com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic parseInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):106 -> a
     75:87:com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic parseInvokeDynamicOnRecord(com.android.tools.r8.cf.code.CfInvokeDynamic,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):106:118 -> a
-com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic -> com.android.tools.r8.internal.ES:
+com.android.tools.r8.ir.desugar.records.RecordRewriterHelper$RecordInvokeDynamic -> com.android.tools.r8.internal.ZS:
     com.android.tools.r8.graph.DexString methodName -> a
     com.android.tools.r8.graph.DexString fieldNames -> c
     com.android.tools.r8.graph.DexField[] fields -> d
@@ -65850,7 +66044,7 @@
     1:1:com.android.tools.r8.graph.DexProto getMethodProto():168:168 -> e
     1:1:com.android.tools.r8.graph.DexProgramClass getRecordClass():156:156 -> f
     1:1:com.android.tools.r8.graph.DexType getRecordType():152:152 -> g
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.oZ:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring -> com.android.tools.r8.internal.JZ:
     com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> b
     java.util.Map paramTypeToAppendMethod -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
@@ -65947,12 +66141,12 @@
     598:598:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
     598:598:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.ProgramMethod,java.lang.String):422 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring):49:49 -> b
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.kZ:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk -> com.android.tools.r8.internal.FZ:
     int variableIndex -> c
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,int):376:377 -> <init>
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk asArgumentChunk() -> a
     1:1:int getVariableIndex():381:381 -> d
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.lZ:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$Chunk -> com.android.tools.r8.internal.GZ:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:1:void <clinit>():337:337 -> <clinit>
@@ -65967,7 +66161,7 @@
     3:3:int com.android.tools.r8.graph.DexProto.getArity():91:91 -> c
     3:3:com.android.tools.r8.ir.code.ValueType getValueType():350 -> c
     4:5:com.android.tools.r8.ir.code.ValueType getValueType():350:351 -> c
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.mZ:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConcatBuilder -> com.android.tools.r8.internal.HZ:
     java.util.List chunks -> a
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring this$0 -> e
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ArgumentChunk biggestArgumentChunk -> b
@@ -65996,12 +66190,12 @@
     39:39:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):312 -> a
     40:56:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):312:328 -> a
     57:61:java.util.Collection desugar(com.android.tools.r8.ir.desugar.LocalStackAllocator):326:330 -> a
-com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.nZ:
+com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk -> com.android.tools.r8.internal.IZ:
     com.android.tools.r8.graph.DexString stringConstant -> c
     1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):400:401 -> <init>
     com.android.tools.r8.ir.desugar.stringconcat.StringConcatInstructionDesugaring$ConstantChunk asConstantChunk() -> b
     1:1:com.android.tools.r8.graph.DexString getStringConstant():405:405 -> d
-com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tools.r8.internal.R10:
+com.android.tools.r8.ir.desugar.twr.TwrInstructionDesugaring -> com.android.tools.r8.internal.n20:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProto twrCloseResourceProto -> c
@@ -66108,17 +66302,17 @@
     87:92:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):433:438 -> a
     93:106:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):510:523 -> a
     93:106:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
-    107:107:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():23:23 -> a
+    107:107:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():22:22 -> a
     107:107:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):524 -> a
     107:107:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
     108:109:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):525:526 -> a
     108:109:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
-    110:110:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():23:23 -> a
+    110:110:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():22:22 -> a
     110:110:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):528 -> a
     110:110:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
     111:111:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):529:529 -> a
     111:111:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
-    112:112:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():23:23 -> a
+    112:112:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():22:22 -> a
     112:112:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):530 -> a
     112:112:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
     113:115:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):531:533 -> a
@@ -66127,7 +66321,7 @@
     116:116:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):534 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     116:116:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
-    117:117:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    117:117:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     117:117:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):534 -> a
     117:117:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
     118:118:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):538:538 -> a
@@ -66136,37 +66330,37 @@
     119:119:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):538 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     119:119:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
-    120:120:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    120:120:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     120:120:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):537 -> a
     120:120:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
     121:121:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):441:441 -> a
-    122:122:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    122:122:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     122:122:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):441 -> a
     123:127:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):444:448 -> a
     128:128:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     128:128:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):450 -> a
     129:137:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):451:459 -> a
     138:138:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):458:458 -> a
-    139:139:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    139:139:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     139:139:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):457 -> a
     140:145:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):463:468 -> a
     146:146:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):467:467 -> a
-    147:147:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    147:147:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     147:147:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):466 -> a
     148:151:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):474:477 -> a
     152:155:void com.android.tools.r8.ir.optimize.AssertionsRewriter.forceAssertionsEnabled(com.android.tools.r8.ir.code.If,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator):594:597 -> a
     152:155:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):478 -> a
-    156:156:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    156:156:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     156:156:void com.android.tools.r8.ir.optimize.AssertionsRewriter.forceAssertionsEnabled(com.android.tools.r8.ir.code.If,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator):597 -> a
     156:156:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):478 -> a
     157:157:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):481:481 -> a
     158:161:void com.android.tools.r8.ir.optimize.AssertionsRewriter.forceAssertionsEnabled(com.android.tools.r8.ir.code.If,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator):594:597 -> a
     158:161:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):482 -> a
-    162:162:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    162:162:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     162:162:void com.android.tools.r8.ir.optimize.AssertionsRewriter.forceAssertionsEnabled(com.android.tools.r8.ir.code.If,java.util.Map,com.android.tools.r8.ir.code.InstructionListIterator):597 -> a
     162:162:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):482 -> a
     163:171:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):485:493 -> a
-    172:172:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    172:172:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     172:172:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):489 -> a
     173:173:boolean runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):494:494 -> a
     174:175:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
@@ -66177,13 +66371,13 @@
     208:231:boolean com.android.tools.r8.ir.optimize.AssertionsRewriter.isDescriptorForClassOrInnerClass(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):193:216 -> a
     208:231:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString getTransformationForType(com.android.tools.r8.graph.DexType):172 -> a
     232:233:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString getTransformationForType(com.android.tools.r8.graph.DexType):160:161 -> a
-    234:234:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):466:466 -> a
+    234:234:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):470:470 -> a
     234:234:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString getTransformationForType(com.android.tools.r8.graph.DexType):161 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    235:240:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):466:471 -> a
+    235:240:boolean com.android.tools.r8.graph.DexString.contains(com.android.tools.r8.graph.DexString):470:475 -> a
     235:240:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString getTransformationForType(com.android.tools.r8.graph.DexType):161 -> a
     241:241:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString getTransformationForType(com.android.tools.r8.graph.DexType):164:164 -> a
-    242:242:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    242:242:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     242:242:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString getTransformationForType(com.android.tools.r8.graph.DexType):164 -> a
     243:243:com.android.tools.r8.ir.optimize.AssertionsRewriter$ConfigurationEntryWithDexString getTransformationForType(com.android.tools.r8.graph.DexType):180:180 -> a
     244:250:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.DeadCodeRemover,com.android.tools.r8.utils.Timing):345:351 -> a
@@ -66209,10 +66403,10 @@
     324:324:boolean com.android.tools.r8.ir.optimize.AssertionsRewriter.isUsingAssertionsControlField(com.android.tools.r8.ir.code.FieldInstruction):544 -> a
     324:324:com.android.tools.r8.ir.code.If isCheckAssertionsEnabledBlock(com.android.tools.r8.ir.code.BasicBlock):568 -> a
     325:325:com.android.tools.r8.ir.code.If isCheckAssertionsEnabledBlock(com.android.tools.r8.ir.code.BasicBlock):569:569 -> a
-    326:326:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():353:353 -> a
+    326:326:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():354:354 -> a
     326:326:com.android.tools.r8.ir.code.If isCheckAssertionsEnabledBlock(com.android.tools.r8.ir.code.BasicBlock):569 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    327:327:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():353:353 -> a
+    327:327:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():354:354 -> a
     327:327:com.android.tools.r8.ir.code.If isCheckAssertionsEnabledBlock(com.android.tools.r8.ir.code.BasicBlock):569 -> a
     328:328:com.android.tools.r8.ir.code.If isCheckAssertionsEnabledBlock(com.android.tools.r8.ir.code.BasicBlock):570:570 -> a
 com.android.tools.r8.ir.optimize.AssertionsRewriter$1 -> com.android.tools.r8.internal.J3:
@@ -66250,7 +66444,7 @@
     1:1:boolean isCompileTimeDisabled():95:95 -> c
     1:1:boolean isCompileTimeEnabled():91:91 -> d
     1:1:boolean isPassthrough():99:99 -> e
-com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal.c4:
+com.android.tools.r8.ir.optimize.AssumeInserter -> com.android.tools.r8.internal.e4:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():62:62 -> <clinit>
@@ -66266,22 +66460,22 @@
     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):80 -> 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):91:91 -> 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):80 -> a
-    13:13:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():803:803 -> a
+    13:13:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():799:799 -> 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):92 -> 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):80 -> 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):96:103 -> 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):80 -> a
-    22:22:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():803:803 -> a
+    22:22:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():799:799 -> 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):104 -> 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):80 -> 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):108:108 -> 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):80 -> a
-    24:24:void com.android.tools.r8.ir.optimize.AssumeInserter.removeRedundantDominatedAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Map):489:489 -> a
+    24:24:void com.android.tools.r8.ir.optimize.AssumeInserter.removeRedundantDominatedAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues,java.util.Map):485:485 -> 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):109 -> 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):80 -> 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):110:110 -> 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):80 -> a
-    26:26:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():803:803 -> a
+    26:26:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues.isEmpty():799:799 -> 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):111 -> 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):80 -> 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):115:117 -> a
@@ -66289,288 +66483,286 @@
     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):81:81 -> 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):142:161 -> 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):160:165 -> a
-    57: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):284:300 -> a
-    57: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):165 -> a
-    74:74:boolean com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.isNonNull():64:64 -> a
-    74:74: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):300 -> a
-    74:74: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):165 -> 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):282:295 -> 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):165 -> a
+    71:71:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection.get(com.android.tools.r8.graph.DexClassAndMember):45:45 -> 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):295 -> 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):165 -> a
+    72:79: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):296:303 -> a
+    72: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):165 -> a
+    80:80: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):302:302 -> a
+    80:80: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):165 -> a
+    81:86: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):174:179 -> a
+    87:87:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.peekPrevious():28:28 -> a
+    87:87: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):179 -> a
+    88:98: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):179:189 -> a
+    99:99:boolean com.android.tools.r8.ir.code.If.isNullTest():94:94 -> a
+    99:99:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():98 -> a
+    99:99: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):190 -> a
+    100:100:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():98:98 -> a
+    100:100: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):190 -> a
+    101:105: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):191:195 -> a
+    106: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):202:208 -> a
+    113:119: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):217:223 -> a
+    113:119: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 -> a
+    120:120:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    120:120:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65 -> a
+    120:120: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):223 -> a
+    120:120: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 -> a
+    121:121:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65:65 -> a
+    121:121: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):223 -> a
+    121:121: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 -> a
+    122:122: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):224:224 -> a
+    122:122: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 -> a
+    123: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):212:212 -> a
+    124:147:boolean computeAssumedValuesForOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):310:333 -> a
+    148:148:void removeRedundantAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):340:340 -> a
+    149:152:java.util.Map computeDominanceForAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):380:383 -> a
+    153:155: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):386:388 -> a
+    156:156:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():696:696 -> a
+    156:156:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isSubsumedBy(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):729 -> a
+    156: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):390 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    75:75:boolean com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.isNonNull():64:64 -> a
-    75:75: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):300 -> a
-    75:75: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):165 -> a
-    76: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):301:307 -> a
-    76: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):165 -> 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):306:306 -> 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):165 -> a
-    84: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):174:179 -> a
-    90:90:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.peekPrevious():28:28 -> 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):179 -> 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):179:189 -> a
-    102:102:boolean com.android.tools.r8.ir.code.If.isNullTest():94:94 -> a
-    102:102:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():98 -> 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):190 -> a
-    103:103:boolean com.android.tools.r8.ir.code.If.isNonTrivialNullTest():98:98 -> 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):190 -> 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):191:195 -> 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):202:208 -> a
-    116:122: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):217:223 -> a
-    116:122: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 -> a
-    123:123:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    123:123:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65 -> a
-    123: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):223 -> a
-    123: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):209 -> a
-    124:124:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.graph.DexType.toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):65:65 -> a
-    124:124: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):223 -> 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):209 -> a
-    125:125: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):224:224 -> a
-    125:125: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 -> a
-    126:126: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):212:212 -> a
-    127:150:boolean computeAssumedValuesForOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder):314:337 -> a
-    151:151:void removeRedundantAssumeInstructions(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):344:344 -> a
-    152:155:java.util.Map computeDominanceForAssumedValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):384:387 -> a
-    156: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):390:392 -> a
-    159:159:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():700:700 -> a
-    159:159:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isSubsumedBy(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):733 -> 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):394 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    160:160:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isSubsumedBy(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):733:733 -> 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):394 -> a
-    161:161:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():954:954 -> a
-    161:161:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.redundant():945 -> a
+    157:157:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isSubsumedBy(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):729:729 -> 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):390 -> a
+    158:158:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():950:950 -> a
+    158:158:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.redundant():941 -> 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):393 -> a
+    159:159:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):733:733 -> 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):397 -> a
+    160:160:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():725:725 -> a
+    160:160:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):734 -> 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):397 -> a
+    161:161:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():696:696 -> a
+    161:161:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):736 -> 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):397 -> a
-    162:162:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):737:737 -> 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):401 -> a
-    163:163:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():729:729 -> a
-    163:163:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):738 -> 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):401 -> a
-    164:164:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():700:700 -> a
-    164:164:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):740 -> 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):401 -> a
-    165:165:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):708:708 -> a
-    165:165:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):741 -> 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):401 -> a
-    166:166: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:406 -> a
-    167:167:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():933:933 -> a
-    167: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):407 -> a
-    168:184: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):414:430 -> a
-    185:185:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everythingElse():937:937 -> a
-    185:185: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):436 -> a
-    186:190:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):626:630 -> a
-    186:190: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):441 -> a
-    191:191: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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":688,"2":689,"3":690}}
-    688:688:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    688:688: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):441 -> a
-    689:689:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    689:689: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):441 -> a
-    690:690:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    690:690: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):441 -> a
-    634:637: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):443:443 -> a
-    644:646: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):450:452 -> a
-    647:647: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):929:929 -> a
-    647:647: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 -> a
-    648:666: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):456:474 -> a
-    667:672: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):638:643 -> a
-    667:672: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 -> a
-    673:673:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    673:673: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):643 -> a
-    673:673: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 -> a
-    674:682: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):645:653 -> a
-    674:682: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 -> a
-    683:687: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):477:481 -> a
-    691:691:boolean lambda$computeDominanceForAssumedValues$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):420:420 -> a
-    692:692:java.util.Set lambda$computeDominanceForAssumedValues$3(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):453:453 -> a
-    693:693:java.util.Map lambda$computeDominanceForAssumedValues$5(com.android.tools.r8.ir.code.Instruction):470:470 -> a
-    694:694:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):524:524 -> a
-    695:695:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
-    695:695:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):524 -> a
-    696:702:void lambda$materializeAssumeInstructions$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):533:539 -> a
-    703:703: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):554:554 -> a
-    704:708: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):556:560 -> a
-    709:713:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):626:630 -> a
-    709:713: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 -> a
-    714:714: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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":784,"2":785,"3":786}}
-    784:784:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    784:784: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 -> a
-    785:785:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    785:785: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 -> a
-    786:786:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):631:631 -> a
-    786:786: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 -> a
-    715:715:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDominance():692:692 -> a
-    715:715: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):563 -> a
+    162:162:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):704:704 -> a
+    162:162:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.strengthenWith(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):737 -> 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):397 -> 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):402:402 -> a
+    164:164:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():929:929 -> 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):403 -> a
+    165:181: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:426 -> a
+    182:182:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everythingElse():933:933 -> a
+    182: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):432 -> a
+    183:187:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):622:626 -> a
+    183:187: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):437 -> a
+    188: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):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":681,"2":682,"3":683}}
+    681:681:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):627:627 -> a
+    681:681: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):437 -> a
+    682:682:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):627:627 -> a
+    682:682: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):437 -> a
+    683:683:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):627:627 -> a
+    683:683: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):437 -> a
+    627:630: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):439:439 -> a
+    637:639: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:448 -> a
+    640:640: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):925:925 -> a
+    640:640: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):451 -> a
+    641:659: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):452:470 -> a
+    660:665: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):634:639 -> a
+    660:665: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):472 -> a
+    666:666:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
+    666:666: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):639 -> a
+    666:666: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):472 -> a
+    667:675: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):641:649 -> a
+    667:675: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):472 -> a
+    676:680: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):473:477 -> a
+    684:684:boolean lambda$computeDominanceForAssumedValues$1(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):416:416 -> a
+    685:685:java.util.Set lambda$computeDominanceForAssumedValues$3(com.android.tools.r8.ir.code.DominatorTree,com.android.tools.r8.ir.code.BasicBlock):449:449 -> a
+    686:686:java.util.Map lambda$computeDominanceForAssumedValues$5(com.android.tools.r8.ir.code.Instruction):466:466 -> a
+    687:687:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):520:520 -> a
+    688:688:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
+    688:688:boolean lambda$materializeAssumeInstructions$7(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):520 -> a
+    689:695:void lambda$materializeAssumeInstructions$9(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):529:535 -> a
+    696:696: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):550:550 -> a
+    697:701: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):552:556 -> a
+    702:706:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):622:626 -> a
+    702:706: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):557 -> a
+    707:707: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):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":777,"2":778,"3":779}}
+    777:777:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):627:627 -> a
+    777:777: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):557 -> a
+    778:778:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):627:627 -> a
+    778:778: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):557 -> a
+    779:779:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.AssumeInserter.getInsertionBlock(com.android.tools.r8.ir.code.Instruction):627:627 -> a
+    779:779: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):557 -> a
+    708:708:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDominance():688:688 -> a
+    708:708: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):559 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    716:717:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():720:721 -> a
-    716:717: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 -> a
-    718:723: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
-    724:729: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):567:572 -> a
-    730:730:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
-    730:730: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 -> a
-    731:731: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:573 -> a
-    732:732:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverythingElse():0:0 -> a
-    732:732: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 -> a
-    733:733: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):575:575 -> a
-    734:737:void com.android.tools.r8.ir.code.Value.replacePhiUsers(com.android.tools.r8.ir.code.Value):620:623 -> a
-    734:737: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
-    738:738:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isSomething():0:0 -> a
-    738:738: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 -> a
-    739:756: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):578:595 -> a
-    757:762: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):592:597 -> a
-    763:764:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():720:721 -> a
-    763:764: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 -> a
-    765:783: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):601:619 -> a
-    787:792: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):583:588 -> a
-    793:793:java.util.Map lambda$materializeSelectedAssumeInstructions$12(com.android.tools.r8.ir.code.BasicBlock):617:617 -> a
-    794:795:boolean com.android.tools.r8.ir.optimize.AssumeInserter.isNullableReferenceType(com.android.tools.r8.ir.code.Value):662:663 -> a
-    794:795:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):668 -> a
-    796:799:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):669:672 -> a
-    800:800:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():700:700 -> a
-    800:800: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):347 -> a
+    709:710:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():716:717 -> a
+    709:710: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 -> a
+    711:716: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:567 -> a
+    717:722: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):563:568 -> a
+    723:723:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
+    723:723: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):568 -> a
+    724:724: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:569 -> a
+    725:725:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverythingElse():0:0 -> a
+    725:725: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 -> a
+    726:726: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:571 -> a
+    727:730:void com.android.tools.r8.ir.code.Value.replacePhiUsers(com.android.tools.r8.ir.code.Value):621:624 -> a
+    727:730: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 -> a
+    731:731:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isSomething():0:0 -> a
+    731:731: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
+    732:749: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:591 -> a
+    750:755: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):588:593 -> a
+    756:757:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():716:717 -> a
+    756:757: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):596 -> a
+    758:776: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):597:615 -> a
+    780:785: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):579:584 -> a
+    786:786:java.util.Map lambda$materializeSelectedAssumeInstructions$12(com.android.tools.r8.ir.code.BasicBlock):613:613 -> a
+    787:788:boolean com.android.tools.r8.ir.optimize.AssumeInserter.isNullableReferenceType(com.android.tools.r8.ir.code.Value):658:659 -> a
+    787:788:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):664 -> a
+    789:792:boolean isNullableReferenceTypeWithOtherNonDebugUsers(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):665:668 -> a
+    793:793:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.hasDynamicTypeInfo():696:696 -> a
+    793:793: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
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    801:809: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):351:359 -> a
-    810:810: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):798:798 -> a
-    810:810: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):365 -> a
+    794:802: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):347:355 -> a
+    803:803: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):794:794 -> a
+    803:803: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):361 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    811:812: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):798:799 -> a
-    811:812: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):365 -> a
-    813:813: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):370:370 -> a
-    814:814:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDynamicTypeAssumption():704:704 -> a
-    814:814: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):374 -> a
-    815:815:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):708:708 -> a
-    815:815: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
+    804:805: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):794:795 -> a
+    804:805: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):361 -> a
+    806:806: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):366:366 -> a
+    807:807:com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.getDynamicTypeAssumption():700:700 -> a
+    807:807: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):370 -> a
+    808:808:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.code.Assume$DynamicTypeAssumption):704:704 -> a
+    808:808: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 -> a
     boolean lambda$materializeSelectedAssumeInstructions$10(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> b
     1:12: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):230:241 -> b
-    13:20:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):23:30 -> b
-    13:20: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
-    21:22: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):244:245 -> b
-    23:23:boolean com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.isNonNull():64:64 -> b
-    23:23: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):245 -> b
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:24:boolean com.android.tools.r8.shaking.ProguardMemberRuleReturnValue.isNonNull():64:64 -> b
-    24:24: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):245 -> b
-    25:40: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):246:261 -> b
-    41:54: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):260:273 -> b
-    55:106:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):493:544 -> b
-    107:107:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> b
-    107:107:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):544 -> b
-    108:108:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):544:544 -> b
-    109:109:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):530:530 -> 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):530 -> b
-    111:111:java.util.List lambda$materializeSelectedAssumeInstructions$13(com.android.tools.r8.ir.code.Instruction):618:618 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.T3:
-    1:1:void <init>():902:902 -> <init>
+    13:14:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):19:20 -> b
+    13:14: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
+    15:15:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection.get(com.android.tools.r8.graph.DexClassAndMember):45:45 -> b
+    15:15:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):20 -> b
+    15: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):242 -> b
+    16:16:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection.get(com.android.tools.r8.graph.DexClassAndMember):45:45 -> b
+    16:16:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):22 -> 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:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):24:24 -> 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):242 -> 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):243:259 -> b
+    35:48: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):258:271 -> b
+    49:100:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):489:540 -> b
+    101:101:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> b
+    101:101:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):540 -> b
+    102:102:void materializeAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues):540:540 -> b
+    103:103:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):526:526 -> b
+    104:104:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> b
+    104:104:boolean lambda$materializeAssumeInstructions$8(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):526 -> b
+    105:105:java.util.List lambda$materializeSelectedAssumeInstructions$13(com.android.tools.r8.ir.code.Instruction):614:614 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance -> com.android.tools.r8.internal.V3:
+    1:1:void <init>():898:898 -> <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.S3:
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance$Builder -> com.android.tools.r8.internal.U3:
     java.util.Map dominatedPhiUsers -> c
     com.android.tools.r8.ir.code.Value assumedValue -> a
     java.util.Set dominatedUsers -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():957:957 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$1):957:957 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Value):964:964 -> <init>
-    3:7:void <init>(com.android.tools.r8.ir.code.Value):961:965 -> <init>
-    1:3:void addDominatedUser(com.android.tools.r8.ir.code.Instruction):969:971 -> a
-    4:6:void addDominatedPhiUser(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):975:977 -> a
-    7:7:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():981:981 -> a
-    8:8:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.nothing():941:941 -> a
-    8:8:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():982 -> a
-    9:11:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():984:984 -> a
-    13:13:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():986:986 -> 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):950:950 -> a
-    14:14:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():986 -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.internal.U3:
+    1:1:void <clinit>():953:953 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$1):953:953 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Value):960:960 -> <init>
+    3:7:void <init>(com.android.tools.r8.ir.code.Value):957:961 -> <init>
+    1:3:void addDominatedUser(com.android.tools.r8.ir.code.Instruction):965:967 -> a
+    4:6:void addDominatedPhiUser(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):971:973 -> a
+    7:7:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():977:977 -> a
+    8:8:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.nothing():937:937 -> a
+    8:8:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():978 -> a
+    9:11:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():980:980 -> a
+    13:13:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():982:982 -> 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):946:946 -> a
+    14:14:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance build():982 -> a
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo -> com.android.tools.r8.internal.W3:
     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
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():681:681 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):687:688 -> <init>
-    1:1:boolean isNonNull():725:725 -> a
-    1:1:void setNotNull():729:729 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.W3:
+    1:1:void <clinit>():677:677 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):683:684 -> <init>
+    1:1:boolean isNonNull():721:721 -> a
+    1:1:void setNotNull():725:725 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues -> com.android.tools.r8.internal.Y3:
     java.util.Map assumedValues -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():746:746 -> <clinit>
-    1:2:void <init>(java.util.Map):755:756 -> <init>
-    1:14:void computeDominance(com.android.tools.r8.utils.TriFunction):765:778 -> a
+    1:1:void <clinit>():742:742 -> <clinit>
+    1:2:void <init>(java.util.Map):751:752 -> <init>
+    1:14:void computeDominance(com.android.tools.r8.utils.TriFunction):761:774 -> 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):778 -> a
-    16:20:void computeDominance(com.android.tools.r8.utils.TriFunction):779:783 -> a
+    15:15:void computeDominance(com.android.tools.r8.utils.TriFunction):774 -> a
+    16:20:void computeDominance(com.android.tools.r8.utils.TriFunction):775:779 -> 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):783 -> a
-    22:24:void computeDominance(com.android.tools.r8.utils.TriFunction):783:785 -> a
+    21:21:void computeDominance(com.android.tools.r8.utils.TriFunction):779 -> a
+    22:24:void computeDominance(com.android.tools.r8.utils.TriFunction):779:781 -> 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):785 -> a
-    26:26:void computeDominance(com.android.tools.r8.utils.TriFunction):785:785 -> a
+    25:25:void computeDominance(com.android.tools.r8.utils.TriFunction):781 -> a
+    26:26:void computeDominance(com.android.tools.r8.utils.TriFunction):781:781 -> 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):785 -> a
-    28:28:void computeDominance(com.android.tools.r8.utils.TriFunction):786:786 -> a
-    29:29:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDominance(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):696:696 -> a
-    29:29:void computeDominance(com.android.tools.r8.utils.TriFunction):788 -> a
-    30:31:void computeDominance(com.android.tools.r8.utils.TriFunction):791:792 -> a
-    32:32:boolean lambda$computeDominance$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):780:780 -> a
-    33:33:void removeAll(java.util.Map):815:815 -> a
-    34:38:void lambda$removeAll$3(com.android.tools.r8.ir.code.Instruction,java.util.Map):817:821 -> a
-    39:56:void removeIf(com.android.tools.r8.utils.TriPredicate):828:845 -> a
-com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.internal.V3:
+    27:27:void computeDominance(com.android.tools.r8.utils.TriFunction):781 -> a
+    28:28:void computeDominance(com.android.tools.r8.utils.TriFunction):782:782 -> a
+    29:29:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDominance(com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance):692:692 -> a
+    29:29:void computeDominance(com.android.tools.r8.utils.TriFunction):784 -> a
+    30:31:void computeDominance(com.android.tools.r8.utils.TriFunction):787:788 -> a
+    32:32:boolean lambda$computeDominance$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction):776:776 -> a
+    33:33:void removeAll(java.util.Map):811:811 -> a
+    34:38:void lambda$removeAll$3(com.android.tools.r8.ir.code.Instruction,java.util.Map):813:817 -> a
+    39:56:void removeIf(com.android.tools.r8.utils.TriPredicate):824:841 -> a
+com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues$Builder -> com.android.tools.r8.internal.X3:
     java.util.Map assumedValues -> a
     java.util.Set nonNullValuesKnownToDominateAllUsers -> b
-    1:7:void <init>():850:856 -> <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):863:867 -> a
+    1:7:void <init>():846:852 -> <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):859:863 -> 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):868 -> 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):868:869 -> a
-    9:9:java.util.Map lambda$updateAssumedValueInfo$0(com.android.tools.r8.ir.code.Instruction):865:865 -> 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):866:866 -> a
-    11:11:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):879:879 -> a
-    12:14:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):712:714 -> a
-    12:14:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):879 -> a
-    15:15:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():729:729 -> a
-    15:15:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):715 -> a
-    15:15:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):879 -> a
-    16:16:boolean isMaybeNull(com.android.tools.r8.ir.code.Value):893:893 -> a
-    17:17:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues build():897:897 -> a
-    18:18:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():933:933 -> a
-    18:18:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):878 -> a
-    19:19:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):878:878 -> 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.DynamicTypeWithUpperBound):875:875 -> a
-    21:21:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():933:933 -> a
-    21:21:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):884 -> a
-    22:22:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):884:884 -> a
-    23:23:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):883:883 -> a
-    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():954:954 -> b
-    1:1:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):889 -> b
-    2:2:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):889:889 -> b
-    3:3:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):888:888 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.internal.X3:
+    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):864 -> 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):864:865 -> a
+    9:9:java.util.Map lambda$updateAssumedValueInfo$0(com.android.tools.r8.ir.code.Instruction):861:861 -> 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):862:862 -> a
+    11:11:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):875:875 -> a
+    12:14:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):708:710 -> a
+    12:14:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):875 -> a
+    15:15:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setNotNull():725:725 -> a
+    15:15:void com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.setDynamicTypeAssumption(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):711 -> a
+    15:15:void lambda$addAssumedValueKnownToDominateAllUsers$2(com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):875 -> a
+    16:16:boolean isMaybeNull(com.android.tools.r8.ir.code.Value):889:889 -> a
+    17:17:com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValues build():893:893 -> a
+    18:18:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():929:929 -> a
+    18:18:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):874 -> a
+    19:19:void addAssumedValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound):874:874 -> 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.DynamicTypeWithUpperBound):871:871 -> a
+    21:21:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.everything():929:929 -> a
+    21:21:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):880 -> a
+    22:22:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):880:880 -> a
+    23:23:void addNonNullValueKnownToDominateAllUsers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):879:879 -> a
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.unknown():950:950 -> b
+    1:1:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):885 -> b
+    2:2:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):885:885 -> b
+    3:3:void addNonNullValueWithUnknownDominance(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):884:884 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance -> com.android.tools.r8.internal.Z3:
     com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance INSTANCE -> a
-    1:1:void <clinit>():993:993 -> <clinit>
-    1:1:void <init>():995:995 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance getInstance():998:998 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.internal.Y3:
+    1:1:void <clinit>():989:989 -> <clinit>
+    1:1:void <init>():991:991 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingAssumedDominance getInstance():994:994 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance -> com.android.tools.r8.internal.a4:
     com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance INSTANCE -> a
-    1:1:void <clinit>():1009:1009 -> <clinit>
-    1:1:void <init>():1012:1012 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance getInstance():1015:1015 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.internal.Z3:
+    1:1:void <clinit>():1005:1005 -> <clinit>
+    1:1:void <init>():1008:1008 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$EverythingElseAssumedDominance getInstance():1011:1011 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance -> com.android.tools.r8.internal.b4:
     com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance INSTANCE -> a
-    1:1:void <clinit>():1026:1026 -> <clinit>
-    1:1:void <init>():1028:1028 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance getInstance():1031:1031 -> b
-com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.internal.a4:
+    1:1:void <clinit>():1022:1022 -> <clinit>
+    1:1:void <init>():1024:1024 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$NothingAssumedDominance getInstance():1027:1027 -> b
+com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance -> com.android.tools.r8.internal.c4:
     java.util.Map dominatedPhiUsers -> b
     java.util.Set dominatedUsers -> a
-    1:3:void <init>(java.util.Set,java.util.Map):1046:1048 -> <init>
+    1:3:void <init>(java.util.Set,java.util.Map):1042:1044 -> <init>
     com.android.tools.r8.ir.optimize.AssumeInserter$SomethingAssumedDominance asSomething() -> a
-    1:1:java.util.Map getDominatedPhiUsers():1056:1056 -> b
-    1:1:java.util.Set getDominatedUsers():1052:1052 -> c
-com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.internal.b4:
+    1:1:java.util.Map getDominatedPhiUsers():1052:1052 -> b
+    1:1:java.util.Set getDominatedUsers():1048:1048 -> c
+com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance -> com.android.tools.r8.internal.d4:
     com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance INSTANCE -> a
-    1:1:void <clinit>():1072:1072 -> <clinit>
-    1:1:void <init>():1074:1074 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance getInstance():1077:1077 -> b
-com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.d4:
+    1:1:void <clinit>():1068:1068 -> <clinit>
+    1:1:void <init>():1070:1070 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.AssumeInserter$UnknownAssumedDominance getInstance():1073:1073 -> b
+com.android.tools.r8.ir.optimize.AssumeRemover -> com.android.tools.r8.internal.f4:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set affectedValues -> c
     java.util.Set assumeInstructionsToRemove -> d
@@ -66590,9 +66782,9 @@
     33:33:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
     33:33:void finish():127 -> a
     34:34:void finish():127:127 -> a
-    35:35:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    35:35:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
     35:35:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):60 -> a
-    36:36:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    36:36:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
     36:36:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     37:38:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):60:61 -> a
@@ -66603,7 +66795,7 @@
     43:43:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.Value):65 -> a
     1:1:java.util.Set getAffectedValues():52:52 -> b
     1:1:boolean mayHaveIntroducedTrivialPhi():56:56 -> c
-com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.internal.M4:
+com.android.tools.r8.ir.optimize.BasicBlockInstructionsEquivalence -> com.android.tools.r8.internal.O4:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     int[] hashes -> c
     com.android.tools.r8.ir.conversion.MethodConversionOptions conversionOptions -> b
@@ -66623,7 +66815,7 @@
     39:39:boolean doEquivalent(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):73 -> a
     40:40:void clearComputedHash(com.android.tools.r8.ir.code.BasicBlock):77:77 -> a
     1:12:int computeHash(com.android.tools.r8.ir.code.BasicBlock):93:104 -> b
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.qa:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.ta:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction waveDoneAction -> d
@@ -66689,7 +66881,7 @@
     392:494:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):390:492 -> a
     495:589:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):398:492 -> a
     590:595:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):405:410 -> a
-    596:600:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():820:824 -> a
+    596:600:boolean com.android.tools.r8.ir.code.Value.isDexItemBasedConstStringThatNeedsToComputeClassName():821:825 -> a
     596:600:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):415 -> a
     601:626:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):418:443 -> a
     627:634: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
@@ -66711,7 +66903,7 @@
     749:749:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     749:749:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):544 -> a
     750:751: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.oa:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.ra:
     java.util.Map fieldsWithStaticValues -> a
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -66721,13 +66913,13 @@
     2:3:void forEachOptimizedField(java.util.function.BiConsumer):80:81 -> a
     4:9:com.android.tools.r8.graph.DexValue getStaticValue(com.android.tools.r8.graph.DexEncodedField):94:99 -> a
     1:3:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):86:88 -> b
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.pa:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.sa:
     java.util.Map fieldsWithStaticValues -> b
     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.Yb:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.bc:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -66920,7 +67112,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     1330:1359: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.contexts.CompilationContext$MethodProcessingContext):1457:1486 -> a
     1330:1359: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.contexts.CompilationContext$MethodProcessingContext):1361 -> a
-    1360:1360:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():23:23 -> a
+    1360:1360:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():22:22 -> a
     1360:1360: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.contexts.CompilationContext$MethodProcessingContext):1488 -> a
     1360:1360: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.contexts.CompilationContext$MethodProcessingContext):1361 -> a
     1361:1372: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.contexts.CompilationContext$MethodProcessingContext):1489:1500 -> a
@@ -66942,7 +67134,7 @@
     1378:1378: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.contexts.CompilationContext$MethodProcessingContext):1361 -> a
     1379:1381: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.contexts.CompilationContext$MethodProcessingContext):1502:1504 -> a
     1379:1381: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.contexts.CompilationContext$MethodProcessingContext):1361 -> a
-    1382:1382:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    1382:1382:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     1382:1382: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.contexts.CompilationContext$MethodProcessingContext):1505 -> a
     1382:1382: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.contexts.CompilationContext$MethodProcessingContext):1361 -> a
     1383:1383: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.contexts.CompilationContext$MethodProcessingContext):1506:1506 -> a
@@ -66952,7 +67144,7 @@
     1384:1384: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.contexts.CompilationContext$MethodProcessingContext):1361 -> a
     1385:1386: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.contexts.CompilationContext$MethodProcessingContext):1514:1515 -> a
     1385:1386: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.contexts.CompilationContext$MethodProcessingContext):1361 -> a
-    1387:1387:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    1387:1387:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> a
     1387:1387: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.contexts.CompilationContext$MethodProcessingContext):1515 -> a
     1387:1387: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.contexts.CompilationContext$MethodProcessingContext):1361 -> a
     1388:1392: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.contexts.CompilationContext$MethodProcessingContext):1516:1520 -> a
@@ -66979,12 +67171,12 @@
     1436:1436:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():387:387 -> a
     1436:1436: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):1568 -> a
     1437:1488: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):1570:1621 -> a
-    1489:1489:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    1489:1489:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     1489:1489: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):1622 -> a
     1490:1490:boolean lambda$removeInstanceOfInstructionIfTrivial$2(com.android.tools.r8.ir.code.Value):1599:1599 -> a
     1491:1495:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1629:1633 -> a
     1496:1497: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):1638:1639 -> a
-    1498:1498:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    1498:1498:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     1498:1498: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):1640 -> a
     1499:1505: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):1642:1648 -> a
     1506:1514:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):1769:1777 -> a
@@ -67074,10 +67266,10 @@
     4025:4026: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,com.android.tools.r8.ir.code.BasicBlock):2795:2796 -> a
     4025:4026:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2800 -> a
     4027:4055:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LazyBox):2972:3000 -> a
-    4056:4056:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> a
+    4056:4056:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():900:900 -> a
     4056:4056:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LazyBox):3004 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4057:4057:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> a
+    4057:4057:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():900:900 -> a
     4057:4057:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LazyBox):3004 -> a
     4058:4072:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.LazyBox):3019:3033 -> a
     4073:4082:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3247:3256 -> a
@@ -67260,15 +67452,15 @@
     91:91:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3139 -> e
     92:94:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):3139:3141 -> e
     1:51:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2821:2871 -> f
-    52:52:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> f
+    52:52:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():900:900 -> f
     52:52:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2872 -> f
     53:62:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2874:2883 -> f
     63:63:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2882:2882 -> f
-    64:64:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> f
+    64:64:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():900:900 -> f
     64:64:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2889 -> f
     65:65:int com.android.tools.r8.ir.optimize.CodeRewriter.negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2961:2961 -> f
     65:65:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2892 -> f
-    66:66:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> f
+    66:66:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():900:900 -> f
     66:66:int com.android.tools.r8.ir.optimize.CodeRewriter.negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2961 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     66:66:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2892 -> f
@@ -67276,11 +67468,11 @@
     67:68:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2892 -> f
     69:82:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2891:2904 -> f
     83:83:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2903:2903 -> f
-    84:84:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> f
+    84:84:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():900:900 -> f
     84:84:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2910 -> f
     85:85:int com.android.tools.r8.ir.optimize.CodeRewriter.negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2961:2961 -> f
     85:85:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2913 -> f
-    86:86:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> f
+    86:86:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():900:900 -> f
     86:86:int com.android.tools.r8.ir.optimize.CodeRewriter.negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2961 -> f
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     86:86:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2913 -> f
@@ -67311,10 +67503,10 @@
     25:25:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3385 -> h
     26:43:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3386:3403 -> h
     1:1:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1227:1227 -> i
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> i
     2:2:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1227 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> i
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> i
     3:3:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1227 -> i
     4:8:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1227:1231 -> i
     9:9:void com.android.tools.r8.ir.optimize.AssumeRemover.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:42 -> i
@@ -67346,11 +67538,11 @@
     89:91:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1303:1305 -> i
     1:1:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):902:902 -> j
     1:1:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):898 -> j
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():2091:2091 -> j
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():2071:2071 -> j
     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):902 -> j
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):898 -> j
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():2091:2091 -> j
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():2071:2071 -> j
     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):902 -> j
     3:3:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):898 -> j
     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):905:905 -> j
@@ -67379,16 +67571,16 @@
     14:14:boolean com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1600:1600 -> k
     14:14:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):265 -> k
     15:33:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):269:287 -> k
-    34:34:boolean com.android.tools.r8.ir.code.Value.isConstZero():808:808 -> k
+    34:34:boolean com.android.tools.r8.ir.code.Value.isConstZero():809:809 -> k
     34:34:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):288 -> k
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:boolean com.android.tools.r8.ir.code.Value.isConstZero():808:808 -> k
+    35:35:boolean com.android.tools.r8.ir.code.Value.isConstZero():809:809 -> k
     35:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):288 -> k
     36:45:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):288:297 -> k
     46:46:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):52:52 -> k
     46:46:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):297 -> k
     47:47:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):301:301 -> k
-    48:48:boolean com.android.tools.r8.ir.code.Value.isConstZero():808:808 -> k
+    48:48:boolean com.android.tools.r8.ir.code.Value.isConstZero():809:809 -> k
     48:48:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):304 -> k
     49:65:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):309:325 -> k
     66:76:void com.android.tools.r8.ir.optimize.CodeRewriter.insertNotNullCheck(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.Position):3297:3307 -> k
@@ -67411,9 +67603,9 @@
     50:50:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> l
     50:50:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1896 -> l
     51:59:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1897:1905 -> l
-    60:60:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> l
+    60:60:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():37:37 -> l
     60:60:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1906 -> l
-    61:61:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> l
+    61:61:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):37:37 -> l
     61:61:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1907 -> l
     62:77:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1908:1923 -> l
     78:78:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> l
@@ -67423,10 +67615,10 @@
     80:81:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1926 -> l
     82:91:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1940:1949 -> l
     1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2177:2177 -> m
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> m
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> m
     2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2177 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> m
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> m
     3:3:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2177 -> m
     4:12:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2180:2188 -> m
     13:29:boolean com.android.tools.r8.ir.optimize.CodeRewriter.allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2153:2169 -> m
@@ -67468,7 +67660,7 @@
     43:61:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2538 -> p
     62:64:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3175:3177 -> p
     62:64:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2542 -> p
-    65:65:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> p
+    65:65:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():900:900 -> p
     65:65:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3177 -> p
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     65:65:com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult simplifyIf(com.android.tools.r8.ir.code.IRCode):2542 -> p
@@ -67591,10 +67783,10 @@
     108:108: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):1812 -> r
     108:108:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1745 -> r
     109:109:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1764:1764 -> r
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.Rb:
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.Ub:
     int[] $SwitchMap$com$android$tools$r8$ir$code$If$Type -> a
     1:1:void <clinit>():2623:2623 -> <clinit>
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.Sb:
+com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.Vb:
     com.android.tools.r8.utils.InternalOptions options -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():2344:2344 -> <clinit>
@@ -67629,7 +67821,7 @@
     52:56:int com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doHash(com.android.tools.r8.ir.code.Instruction):2401 -> a
     52:56:int doHash(java.lang.Object):2344 -> a
     57:62:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2408:2413 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.Tb:
+com.android.tools.r8.ir.optimize.CodeRewriter$ControlFlowSimplificationResult -> com.android.tools.r8.internal.Wb:
     boolean anyAffectedValues -> a
     boolean anySimplifications -> b
     boolean $assertionsDisabled -> c
@@ -67638,7 +67830,7 @@
     2:5:void <init>(boolean,boolean):2506:2509 -> <init>
     1:1:boolean anyAffectedValues():2513:2513 -> a
     1:1:boolean anySimplifications():2517:2517 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.Ub:
+com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.Xb:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> g
     com.android.tools.r8.ir.code.BasicBlock target -> f
     com.android.tools.r8.ir.code.Value left -> d
@@ -67662,11 +67854,11 @@
     23:26:com.android.tools.r8.ir.code.BasicBlock build():616 -> a
     27:29:com.android.tools.r8.ir.code.BasicBlock build():618:620 -> a
     1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):595:595 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.Vb:
+com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.Yb:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
     1:2:void <init>(com.android.tools.r8.ir.code.Position):495:496 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.Wb:
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.Zb:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():701:701 -> <clinit>
@@ -67706,7 +67898,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     16:16:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> b
     16:16:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):723 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.Xb:
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.ac:
     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
@@ -67726,7 +67918,7 @@
     32:33:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):560:561 -> a
     34:34:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):550:550 -> 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):556:556 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.Sd:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.Vd:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> a
     int numberOfEffectivelyFinalFieldCanonicalization -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> g
@@ -67785,17 +67977,17 @@
     184:189:void com.android.tools.r8.ir.optimize.ConstantCanonicalizer.insertCanonicalizedConstant(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):282:287 -> a
     184:189:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):257 -> a
     190:193:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):258:261 -> a
-    194:194:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):426:426 -> a
+    194:194:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):427:427 -> a
     194:194:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):261 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    195:196:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):426:427 -> a
+    195:196:boolean com.android.tools.r8.ir.code.Value.hasUserThatMatches(java.util.function.Predicate):427:428 -> a
     195:196:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):261 -> a
     197:205:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):262:270 -> a
     206:206:java.util.List lambda$canonicalize$1(com.android.tools.r8.ir.code.Instruction):181:181 -> a
     207:207:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):197:197 -> a
     208:208: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):207:207 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):206:206 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.Rd:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.Ud:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():94:94 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):94:94 -> <init>
@@ -67811,7 +68003,7 @@
     29:29:int hashCode(java.lang.Object):94 -> a
     30:30:int com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1.hashCode(com.android.tools.r8.ir.code.Instruction):101:101 -> a
     30:30:int hashCode(java.lang.Object):94 -> a
-com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.Ze:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.df:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     boolean $assertionsDisabled -> c
@@ -67829,10 +68021,10 @@
     50:50:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     50:50:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):143 -> a
     51:51:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):143:143 -> a
-    52:52:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    52:52:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     52:52:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):143 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    53:53:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    53:53:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     53:53:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):143 -> a
     54:59:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):144:149 -> a
     60:77:void removeDeadInstructions(java.util.Queue,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):145:162 -> a
@@ -67864,7 +68056,7 @@
     15:15:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):81 -> b
     16:16:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):82:82 -> b
     17:17:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):81:81 -> b
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.Ye:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.cf:
     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>():262:270 -> <clinit>
@@ -67875,16 +68067,16 @@
     boolean isMaybeDead() -> c
     boolean isNotDead() -> d
     1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult notDead():283:283 -> e
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.Ve:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.Ze:
     1:1:void <init>():263:263 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.We:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.af:
     1:1:void <init>():271:271 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.Xe:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.bf:
     com.android.tools.r8.ir.code.Value val$inValueRequiredToBeDead -> c
     1:1:void <init>(com.android.tools.r8.ir.code.Value):287:287 -> <init>
     1:1:java.lang.Iterable getValuesRequiredToBeDead():300:300 -> b
     2:2:java.util.Iterator lambda$getValuesRequiredToBeDead$0(com.android.tools.r8.ir.code.Value):300:300 -> b
-com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.internal.sf:
+com.android.tools.r8.ir.optimize.DefaultInliningOracle -> com.android.tools.r8.internal.wf:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> e
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> c
@@ -67893,145 +68085,166 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy reasonStrategy -> f
     com.android.tools.r8.graph.ProgramMethod method -> d
-    1:1:void <clinit>():56:56 -> <clinit>
-    1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int):71:78 -> <init>
+    1:1:void <clinit>():57:57 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int):72:79 -> <init>
     com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement) -> a
     boolean isForcedInliningOracle() -> a
-    1:18:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):100:117 -> a
-    1:18:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):270 -> a
-    19:32:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):342:355 -> a
-    19:32:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):274 -> a
-    33:33:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
-    33:33:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355 -> a
+    1:18:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):101:118 -> a
+    1:18:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):271 -> a
+    19:26:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):343:350 -> a
+    19:26:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    27:27:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    27:27:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):350 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:33:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):274 -> a
-    34:34:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
-    34:34:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355 -> a
-    34:34:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):274 -> a
-    35:36:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):355:356 -> a
-    35:36:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):274 -> a
-    37:37:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404:404 -> a
-    37:37:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
-    37:37:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):274 -> a
-    38:38:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):400:400 -> a
-    38:38:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404 -> a
-    38:38:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
-    38:38:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):274 -> a
-    39:39:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):352:352 -> a
-    39:39:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):274 -> a
-    40:41:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275:276 -> a
-    42:42:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":482,"2":483,"3":484}}
-    482:482:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):276:276 -> a
-    483:483:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):276:276 -> a
-    484:484:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):276:276 -> a
-    320:369:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):278:327 -> a
-    370:478:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):481:589 -> a
-    370:478:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):325 -> a
-    479:479:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):101:101 -> a
-    479:479:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):270 -> a
-    480:480:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":485,"2":486,"3":487}}
-    485:485:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):101:101 -> a
-    485:485:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):270 -> a
-    486:486:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):101:101 -> a
-    486:486:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):270 -> a
-    487:487:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):101:101 -> a
-    487:487:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):270 -> a
-    481:481:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):103:103 -> a
-    481:481:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):270 -> a
-    488:490:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):133:135 -> a
-    491:499:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):134:142 -> a
-    500:500:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    500:500:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):142 -> a
+    27:27:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    28:28:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    28:28:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):350 -> a
+    28:28:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    29:29:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351:351 -> a
+    29:29:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    30:30:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):53:53 -> a
+    30:30:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    30:30:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    31:31:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    31:31:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):53 -> a
+    31:31:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):351 -> a
+    31:31:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    32:32:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    32:32:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):352 -> a
+    32:32:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    33:33:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356:356 -> a
+    33:33:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    34:34:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
+    34:34:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    501:501:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    501:501:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):142 -> a
-    502:526:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):144:168 -> a
-    527:527:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInSameBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):199:199 -> a
-    527:527:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):168 -> a
-    528:528:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
-    528:528:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInSameBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):204 -> a
-    528:528:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInSameBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):199 -> a
-    528:528:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):168 -> a
-    529:529:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):171:171 -> a
+    34:34:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    35:35:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
+    35:35:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356 -> a
+    35:35:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    36:37:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):356:357 -> a
+    36:37:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    38:38:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404:404 -> a
+    38:38:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):357 -> a
+    38:38:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    39:39:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):400:400 -> a
+    39:39:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404 -> a
+    39:39:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):357 -> a
+    39:39:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    40:40:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.neverInline(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):353:353 -> a
+    40:40:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):275 -> a
+    41:42:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):276:277 -> a
+    43:43:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":484,"2":485,"3":486}}
+    484:484:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):277:277 -> a
+    485:485:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):277:277 -> a
+    486:486:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):277:277 -> a
+    322:371:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):279:328 -> a
+    372:480:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):482:590 -> a
+    372:480:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):326 -> a
+    481:481:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):102:102 -> a
+    481:481:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):271 -> a
+    482:482:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":487,"2":488,"3":489}}
+    487:487:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):102:102 -> a
+    487:487:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):271 -> a
+    488:488:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):102:102 -> a
+    488:488:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):271 -> a
+    489:489:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):102:102 -> a
+    489:489:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):271 -> a
+    483:483:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):104:104 -> a
+    483:483:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):271 -> a
+    490:492:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):134:136 -> a
+    493:501:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):135:143 -> a
+    502:502:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    502:502:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):143 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    503:503:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    503:503:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):143 -> a
+    504:528:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):145:169 -> a
+    529:529:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInSameBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):199:199 -> a
+    529:529:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):169 -> a
     530:530:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
-    530:530:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
-    530:530:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):171 -> a
-    531:531:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179:179 -> a
-    531:531:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):171 -> a
-    532:537:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):172:177 -> a
-    538:538:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
-    538:538:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):177 -> a
+    530:530:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInSameBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):204 -> a
+    530:530:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInSameBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticItems):199 -> a
+    530:530:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):169 -> a
+    531:531:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):172:172 -> a
+    532:532:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
+    532:532:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179 -> a
+    532:532:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):172 -> a
+    533:533:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):179:179 -> a
+    533:533:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):172 -> a
+    534:539:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):173:178 -> a
+    540:540:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
+    540:540:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):178 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    539:539:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing() -> a
-    539:539:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):177 -> a
-    540:561:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):177:198 -> a
-    562:569:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):197:204 -> a
-    570:570:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):203:203 -> a
-    571:571:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):202:202 -> a
-    572:572:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):257:257 -> a
-    573:573: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):121:121 -> a
-    573:573:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):257 -> a
+    541:541:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
+    541:541:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):178 -> a
+    542:563:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):178:199 -> a
+    564:571:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):198:205 -> a
+    572:572:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):204:204 -> a
+    573:573:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):203:203 -> a
+    574:574:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):258:258 -> a
+    575:575: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):121:121 -> a
+    575:575:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):258 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    574:574: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):121:121 -> a
-    574:574:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):257 -> a
-    575:576: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):368:369 -> a
-    577:577:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():387:387 -> a
-    577:577: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):369 -> a
+    576:576: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):121:121 -> a
+    576:576:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):258 -> a
+    577:578: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):369:370 -> a
+    579:579:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():387:387 -> a
+    579:579: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):370 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    578:578:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():387:387 -> a
-    578:578: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):369 -> a
-    579:585: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):371:377 -> a
-    586:586:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():387:387 -> a
-    586:586: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):377 -> a
+    580:580:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():387:387 -> a
+    580:580: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):370 -> a
+    581:587: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):372:378 -> a
+    588:588:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():387:387 -> a
+    588:588: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):378 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    587:587:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():387:387 -> a
-    587:587: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):377 -> a
-    588:594: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):377:383 -> a
-    595:604: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):396:405 -> a
-    605:613: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):419:427 -> a
-    614:623: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):424:433 -> a
-    624:639: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):432:447 -> a
-    640:640: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):426:426 -> a
-    641:643:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):459:461 -> a
-    644:644:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():496:496 -> a
-    644:644:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):461 -> a
-    645:650:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):465:470 -> a
-    651:651:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):596:596 -> a
-    652:652:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():496:496 -> a
-    652:652:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):596 -> a
-    653:655:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):599:601 -> a
-    656:656: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):613:613 -> a
-    657:657:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():496:496 -> a
-    657:657: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):613 -> a
-    658:660:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):624:626 -> a
-    658:660: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):616 -> a
-    661:661: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):617:617 -> a
-    662:666:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):711:715 -> a
-    662:666: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):618 -> a
-    667:667:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1694:1694 -> a
-    667:667:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):716 -> a
-    667:667: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):618 -> a
+    589:589:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDefinitelyNull():387:387 -> a
+    589:589: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):378 -> a
+    590:596: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):378:384 -> a
+    597:606: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):397:406 -> a
+    607:615: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):420:428 -> a
+    616:625: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):425:434 -> a
+    626:641: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):433:448 -> a
+    642:642: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):427:427 -> a
+    643:645:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):460:462 -> a
+    646:646:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():497:497 -> a
+    646:646:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):462 -> a
+    647:652:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):466:471 -> a
+    653:653:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):597:597 -> a
+    654:654:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():497:497 -> a
+    654:654:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):597 -> a
+    655:657:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):600:602 -> a
+    658:658: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):614:614 -> a
+    659:659:boolean com.android.tools.r8.ir.optimize.Inliner$Reason.mustBeInlined():497:497 -> a
+    659:659: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):614 -> a
+    660:662:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):625:627 -> a
+    660:662: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):617 -> a
+    663:663: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):618:618 -> a
+    664:668:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):712:716 -> a
+    664:668: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):619 -> a
+    669:669:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1694:1694 -> a
+    669:669:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):717 -> a
+    669:669: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):619 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    668:669:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1694:1695 -> a
-    668:669:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):716 -> a
-    668:669: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):618 -> a
-    670:675:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):722:727 -> a
-    670:675: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):618 -> a
-    676:708: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):646:678 -> a
-    709:709:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):737:737 -> a
-    1:1:com.android.tools.r8.graph.AppView appView():83:83 -> b
-    2:7:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):210:215 -> b
-    8:10:int com.android.tools.r8.ir.optimize.DefaultInliningOracle.getInliningInstructionLimitIncrement(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):230:232 -> b
-    8:10:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):216 -> b
+    670:671:int com.android.tools.r8.ir.code.BasicBlock.numberOfThrowingInstructions():1694:1695 -> a
+    670:671:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):717 -> a
+    670:671: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):619 -> a
+    672:677:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):723:728 -> a
+    672:677: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):619 -> a
+    678:710: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):647:679 -> a
+    711:711:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):738:738 -> a
+    1:1:com.android.tools.r8.graph.AppView appView():84:84 -> b
+    2:7:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):211:216 -> b
+    8:10:int com.android.tools.r8.ir.optimize.DefaultInliningOracle.getInliningInstructionLimitIncrement(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):231:233 -> b
+    8:10:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):217 -> b
     11:11:int com.android.tools.r8.ir.code.InvokeMethod.getFirstNonReceiverArgumentIndex():81:81 -> b
-    11:11:int com.android.tools.r8.ir.optimize.DefaultInliningOracle.getInliningInstructionLimitIncrement(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):233 -> b
-    11:11:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):216 -> b
-    12:25:int com.android.tools.r8.ir.optimize.DefaultInliningOracle.getInliningInstructionLimitIncrement(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):234:247 -> b
-    12:25:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):216 -> b
-    26:34:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):217:225 -> b
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.Dg:
+    11:11:int com.android.tools.r8.ir.optimize.DefaultInliningOracle.getInliningInstructionLimitIncrement(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):234 -> b
+    11:11:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):217 -> b
+    12:25:int com.android.tools.r8.ir.optimize.DefaultInliningOracle.getInliningInstructionLimitIncrement(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):235:248 -> b
+    12:25:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):217 -> b
+    26:34:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):218:226 -> b
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.Hg:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> c
@@ -68057,7 +68270,7 @@
     66:66:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
     66:66:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):125 -> a
     67:79:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):126:138 -> a
-    80:80:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    80:80:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> a
     80:80:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):138 -> a
     81:89:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):135:143 -> a
     90:98:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):142:150 -> a
@@ -68114,7 +68327,7 @@
     344:344:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
     344:344:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):316 -> a
     345:347:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):316:318 -> a
-com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.mi:
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.qi:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():18:18 -> <clinit>
@@ -68124,10 +68337,10 @@
     3:3:com.android.tools.r8.ir.analysis.type.DynamicType computeDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):34 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:8:com.android.tools.r8.ir.analysis.type.DynamicType computeDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):34:38 -> a
-    9:9:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    9:9:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> a
     9:9:com.android.tools.r8.ir.analysis.type.DynamicType computeDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):38 -> a
     10:13:com.android.tools.r8.ir.analysis.type.DynamicType computeDynamicReturnType(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):38:41 -> a
-com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.internal.Dl:
+com.android.tools.r8.ir.optimize.ForcedInliningOracle -> com.android.tools.r8.internal.Il:
     java.util.Map invokesToInline -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ProgramMethod method -> b
@@ -68151,7 +68364,7 @@
     16:16:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):83:83 -> a
     17:21:com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement):144:148 -> a
     1:1:com.android.tools.r8.graph.AppView appView():42:42 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.Ao:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.Fo:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> e
@@ -68195,7 +68408,7 @@
     223:245:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):287:309 -> a
     246:246: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.zo:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.Eo:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -68205,7 +68418,7 @@
     7:7:int hashCode(java.lang.Object):97:97 -> a
     8:8:int com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1.hashCode(com.android.tools.r8.ir.code.InvokeMethod):100:100 -> a
     8:8:int hashCode(java.lang.Object):97 -> a
-com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.internal.xq:
+com.android.tools.r8.ir.optimize.Inliner -> com.android.tools.r8.internal.Cq:
     java.util.Set singleCallerInlinedPrunedMethodsForTesting -> g
     com.android.tools.r8.ir.optimize.MultiCallerInliner multiCallerInliner -> e
     com.android.tools.r8.graph.AppView appView -> a
@@ -68215,89 +68428,89 @@
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder singleInlineCallers -> d
     java.util.Map singleCallerInlinedMethodsInWave -> f
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
-    1:1:void <clinit>():86:86 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):111:111 -> <init>
-    2:23:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):101:122 -> <init>
+    1:1:void <clinit>():87:87 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):112:112 -> <init>
+    2:23:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.LensCodeRewriter):102:123 -> <init>
     boolean lambda$performInliningImpl$1(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
-    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):162:168 -> a
-    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():899:899 -> a
-    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):168 -> a
+    1:7:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):163:169 -> a
+    8:8:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():900:900 -> a
+    8:8:boolean returnsIntAsBoolean(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):169 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:void recordCallEdgesForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):179:179 -> a
-    10:16: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):851:857 -> a
-    17:17: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):852:852 -> a
-    18:23: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):885:890 -> a
-    24:32: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):887:895 -> a
-    33:35:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):901:903 -> a
-    36:36: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):904:904 -> a
-    37:37:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):924:924 -> a
-    38:38: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):941:941 -> a
+    9:9:void recordCallEdgesForMultiCallerInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):180:180 -> a
+    10:16: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):852:858 -> a
+    17:17: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):853:853 -> a
+    18:23: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):886:891 -> a
+    24:32: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):888:896 -> a
+    33:35:com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy createDefaultInliningReasonStrategy(com.android.tools.r8.ir.conversion.MethodProcessor):902:904 -> a
+    36:36: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):905:905 -> a
+    37:37:com.android.tools.r8.ir.optimize.DefaultInliningOracle createDefaultOracle(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,int,com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy):925:925 -> a
+    38:38: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):942:942 -> a
     39:39:void com.android.tools.r8.ir.optimize.AssumeRemover.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):42:42 -> a
-    39:39: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):941 -> a
-    40:72: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):942:974 -> a
-    73:74:boolean com.android.tools.r8.ir.optimize.Inliner.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):1117:1118 -> a
-    73:74: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):973 -> a
+    39:39: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):942 -> a
+    40:72: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):943:975 -> a
+    73:74:boolean com.android.tools.r8.ir.optimize.Inliner.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):1118:1119 -> a
+    73:74: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):974 -> a
     75:75:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
-    75:75:boolean com.android.tools.r8.ir.optimize.Inliner.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):1121 -> a
-    75:75: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):973 -> a
-    76:78:boolean com.android.tools.r8.ir.optimize.Inliner.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):1122:1122 -> a
-    76:78: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):973 -> a
-    87:87:boolean com.android.tools.r8.ir.optimize.Inliner.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):1131:1131 -> a
-    87:87: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):973 -> a
-    88:110: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):979:1001 -> a
+    75:75:boolean com.android.tools.r8.ir.optimize.Inliner.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):1122 -> a
+    75:75: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):974 -> a
+    76:78:boolean com.android.tools.r8.ir.optimize.Inliner.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):1123:1123 -> a
+    76:78: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):974 -> a
+    87:87:boolean com.android.tools.r8.ir.optimize.Inliner.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):1132:1132 -> a
+    87:87: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):974 -> a
+    88:110: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):980:1002 -> a
     111:111:boolean com.android.tools.r8.ir.optimize.Inliner$InlineResult.isRetryAction():0:0 -> a
-    111:111: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1005 -> a
-    112:112:void com.android.tools.r8.ir.optimize.Inliner.enqueueMethodForReprocessing(com.android.tools.r8.graph.ProgramMethod):1246:1246 -> a
-    112:112: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1006 -> a
-    113:121: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1010:1018 -> a
-    122:163: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1017:1058 -> a
-    164:180: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1052:1068 -> a
-    181:210: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1067:1096 -> a
+    111:111: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1006 -> a
+    112:112:void com.android.tools.r8.ir.optimize.Inliner.enqueueMethodForReprocessing(com.android.tools.r8.graph.ProgramMethod):1247:1247 -> a
+    112:112: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1007 -> a
+    113:121: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1011:1019 -> a
+    122:163: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1018:1059 -> a
+    164:180: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1053:1069 -> a
+    181:210: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1068:1097 -> a
     211:211:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    211:211: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1098 -> a
-    212:221: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1099:1108 -> a
-    222:230:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1136:1144 -> a
-    222:230:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):135 -> a
-    231:243:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):136:148 -> a
-    244:246:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.Inliner.instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):127:129 -> a
-    244:246:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):150 -> a
-    247:247:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):156:156 -> a
-    248:261:void postProcessInlineeBlocks(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):1180:1193 -> a
-    262:262:void com.android.tools.r8.ir.optimize.Inliner.rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1227:1227 -> a
-    262:262:void postProcessInlineeBlocks(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):1196 -> a
-    263:263:void postProcessInlineeBlocks(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):1197:1197 -> a
-    264:264:void com.android.tools.r8.ir.optimize.Inliner.rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1227:1227 -> a
-    264:264:void postProcessInlineeBlocks(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):1200 -> a
-    265:266:void lambda$postProcessInlineeBlocks$2(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.BasicBlock):1189:1190 -> a
-    267:269:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,com.android.tools.r8.utils.Timing):1208:1210 -> a
-    270:274:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1217:1221 -> a
+    211:211: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1099 -> a
+    212:221: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1100:1109 -> a
+    222:230:boolean com.android.tools.r8.ir.optimize.Inliner.containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1137:1145 -> a
+    222:230:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):136 -> a
+    231:243:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):137:149 -> a
+    244:246:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.Inliner.instructionAllowedForInlining(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):128:130 -> a
+    244:246:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):151 -> a
+    247:247:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):157:157 -> a
+    248:261:void postProcessInlineeBlocks(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):1181:1194 -> a
+    262:262:void com.android.tools.r8.ir.optimize.Inliner.rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1228:1228 -> a
+    262:262:void postProcessInlineeBlocks(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):1197 -> a
+    263:263:void postProcessInlineeBlocks(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):1198:1198 -> a
+    264:264:void com.android.tools.r8.ir.optimize.Inliner.rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock):1228:1228 -> a
+    264:264:void postProcessInlineeBlocks(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):1201 -> a
+    265:266:void lambda$postProcessInlineeBlocks$2(java.util.Set,java.util.Set,com.android.tools.r8.ir.code.BasicBlock):1190:1191 -> a
+    267:269:void insertAssumeInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,java.util.Set,com.android.tools.r8.utils.Timing):1209:1211 -> a
+    270:274:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1218:1222 -> a
     275:275:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
-    275:275:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1221 -> a
-    276:278:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1221:1223 -> a
-    279:286:void rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer):1235:1242 -> a
-    287:316:void onWaveDone():1259:1288 -> a
-    317:335:void lambda$onWaveDone$4(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):1262:1280 -> a
-    336:341:void lambda$onWaveDone$4(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):1279:1284 -> a
-    342:346:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1296:1300 -> a
+    275:275:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1222 -> a
+    276:278:void applyMemberValuePropagationToInlinee(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set):1222:1224 -> a
+    279:286:void rewindBlockIterator(java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer):1236:1243 -> a
+    287:316:void onWaveDone():1260:1289 -> a
+    317:335:void lambda$onWaveDone$4(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):1263:1281 -> a
+    336:341:void lambda$onWaveDone$4(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):1280:1285 -> a
+    342:346:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1297:1301 -> a
     347:347:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder.rewrittenWithLens(com.android.tools.r8.graph.AppView):142:142 -> a
-    347:347:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1300 -> a
-    348:349:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1300:1301 -> a
-    350:357:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1298:1305 -> a
-    358:358:boolean lambda$onLastWaveDone$5(com.android.tools.r8.graph.ProgramMethod):1303:1303 -> a
-    359:359:boolean lambda$verifyAllSingleCallerMethodsHaveBeenPruned$6(com.android.tools.r8.graph.DexEncodedMethod):1312:1312 -> a
-    360:362:void lambda$verifyAllSingleCallerMethodsHaveBeenPruned$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):1314:1314 -> a
-    363:363:boolean verifyIsPrunedDueToSingleCallerInlining(com.android.tools.r8.graph.DexMethod):1322:1322 -> a
-    364:366:boolean verifyAllMultiCallerInlinedMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1327:1329 -> a
-    1:6:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):800:805 -> b
+    347:347:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1301 -> a
+    348:349:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1301:1302 -> a
+    350:357:void onLastWaveDone(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):1299:1306 -> a
+    358:358:boolean lambda$onLastWaveDone$5(com.android.tools.r8.graph.ProgramMethod):1304:1304 -> a
+    359:359:boolean lambda$verifyAllSingleCallerMethodsHaveBeenPruned$6(com.android.tools.r8.graph.DexEncodedMethod):1313:1313 -> a
+    360:362:void lambda$verifyAllSingleCallerMethodsHaveBeenPruned$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):1315:1315 -> a
+    363:363:boolean verifyIsPrunedDueToSingleCallerInlining(com.android.tools.r8.graph.DexMethod):1323:1323 -> a
+    364:366:boolean verifyAllMultiCallerInlinedMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1328:1330 -> a
+    1:6:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):801:806 -> b
     7:7:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
-    7:7:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):811 -> b
-    8:15:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):817:824 -> b
-    16:19:boolean lambda$onWaveDone$3(com.android.tools.r8.graph.ProgramMethod):1266:1269 -> b
-    20:21:boolean verifyAllSingleCallerMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1310:1311 -> b
-    1:1:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1255:1255 -> c
-    1:1:void com.android.tools.r8.ir.optimize.Inliner.onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1255:1255 -> d
-    1:1:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1250 -> d
-    2:2:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1251:1251 -> d
+    7:7:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):812 -> b
+    8:15:int numberOfInstructions(com.android.tools.r8.ir.code.IRCode):818:825 -> b
+    16:19:boolean lambda$onWaveDone$3(com.android.tools.r8.graph.ProgramMethod):1267:1270 -> b
+    20:21:boolean verifyAllSingleCallerMethodsHaveBeenPruned(com.android.tools.r8.graph.AppView):1311:1312 -> b
+    1:1:void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1256:1256 -> c
+    1:1:void com.android.tools.r8.ir.optimize.Inliner.onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod):1256:1256 -> d
+    1:1:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1251 -> d
+    2:2:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):1252:1252 -> d
 com.android.tools.r8.ir.optimize.Inliner$Constraint -> com.android.tools.r8.ir.optimize.a:
     com.android.tools.r8.ir.optimize.Inliner$Constraint SAMENEST -> e
     com.android.tools.r8.ir.optimize.Inliner$Constraint[] $VALUES -> i
@@ -68307,138 +68520,138 @@
     com.android.tools.r8.ir.optimize.Inliner$Constraint ALWAYS -> h
     com.android.tools.r8.ir.optimize.Inliner$Constraint SUBCLASS -> g
     com.android.tools.r8.ir.optimize.Inliner$Constraint PACKAGE -> f
-    1:18:void <clinit>():189:189 -> <clinit>
-    43:47:void <clinit>():214:218 -> <clinit>
-    1:2:void <init>(java.lang.String,int,int):209:210 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():189:189 -> a
-    2:2:boolean isSet(int):229:229 -> a
+    1:18:void <clinit>():190:190 -> <clinit>
+    43:47:void <clinit>():215:219 -> <clinit>
+    1:2:void <init>(java.lang.String,int,int):210:211 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.Inliner$Constraint[] values():190:190 -> a
+    2:2:boolean isSet(int):230:230 -> a
 com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget -> com.android.tools.r8.ir.optimize.b:
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget ALWAYS -> d
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget NEVER -> c
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType targetHolder -> b
-    1:9:void <clinit>():247:255 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):257:260 -> <init>
-    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):263:267 -> <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):290:313 -> 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):319:330 -> 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):335:385 -> a
-    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):462:472 -> 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):385 -> 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):386:393 -> a
-    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):439:454 -> 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):393 -> 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):397:430 -> a
-    1:5:boolean equals(java.lang.Object):280:284 -> equals
-    1:4:int hashCode():272:275 -> hashCode
+    1:9:void <clinit>():248:256 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint):258:261 -> <init>
+    5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):264:268 -> <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):291:314 -> 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):320:331 -> 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):336:386 -> a
+    88:98:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):463:473 -> 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):386 -> 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):387:394 -> a
+    107:122:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):440:455 -> 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):394 -> 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):398:431 -> a
+    1:5:boolean equals(java.lang.Object):281:285 -> equals
+    1:4:int hashCode():273:276 -> hashCode
     5:5:int com.android.tools.r8.graph.DexType.computeHashCode():124:124 -> hashCode
-    5:5:int hashCode():275 -> hashCode
+    5:5:int hashCode():276 -> hashCode
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:int com.android.tools.r8.graph.DexType.computeHashCode():124:124 -> hashCode
-    6:6:int hashCode():275 -> hashCode
-com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.internal.rq:
+    6:6:int hashCode():276 -> hashCode
+com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.internal.wq:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> c
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexProgramClass downcastClass -> e
     com.android.tools.r8.graph.ProgramMethod target -> a
     com.android.tools.r8.ir.code.Invoke invoke -> b
     boolean shouldEnsureStaticInitialization -> d
-    1:1:void <clinit>():511:511 -> <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):521:524 -> <init>
+    1:1:void <clinit>():512:512 -> <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):522:525 -> <init>
     com.android.tools.r8.ir.optimize.Inliner$InlineAction asInlineAction() -> a
-    1:1:void setDowncastClass(com.android.tools.r8.graph.DexProgramClass):537:537 -> a
-    2:15: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.conversion.LensCodeRewriter):550:563 -> a
-    16:25:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):716:725 -> a
-    16: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.conversion.LensCodeRewriter):559 -> a
-    26:26:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):722:722 -> 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.conversion.LensCodeRewriter):559 -> a
-    27:28:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):574:575 -> a
+    1:1:void setDowncastClass(com.android.tools.r8.graph.DexProgramClass):538:538 -> a
+    2:15: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.conversion.LensCodeRewriter):551:564 -> a
+    16:25:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):717:726 -> a
+    16: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.conversion.LensCodeRewriter):560 -> a
+    26:26:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):723:723 -> 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.conversion.LensCodeRewriter):560 -> a
+    27:28:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):575:576 -> a
     29:29:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():442:442 -> a
-    29:29:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):575 -> a
+    29:29:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):576 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:30:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():442:442 -> a
-    30: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.conversion.LensCodeRewriter):575 -> a
-    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    31:31: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.conversion.LensCodeRewriter):575 -> a
+    30: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.conversion.LensCodeRewriter):576 -> a
+    31:31:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    31:31: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.conversion.LensCodeRewriter):576 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    32:32:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    32:32:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):575 -> a
-    33:36: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.conversion.LensCodeRewriter):576:579 -> a
-    37:37:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():481:481 -> a
-    37:37: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.conversion.LensCodeRewriter):579 -> a
+    32:32:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    32:32:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):576 -> a
+    33:36: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.conversion.LensCodeRewriter):577:580 -> a
+    37:37:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():482:482 -> a
+    37:37: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.conversion.LensCodeRewriter):580 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    38:39: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.conversion.LensCodeRewriter):582:583 -> a
-    40:49:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):716:725 -> a
-    40:49: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.conversion.LensCodeRewriter):581 -> a
-    50:50:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):722:722 -> a
-    50:50: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.conversion.LensCodeRewriter):581 -> a
-    51:53: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.conversion.LensCodeRewriter):589:591 -> a
-    54:60: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.conversion.LensCodeRewriter):590:596 -> a
+    38:39: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.conversion.LensCodeRewriter):583:584 -> a
+    40:49:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):717:726 -> a
+    40:49: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.conversion.LensCodeRewriter):582 -> a
+    50:50:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.handleSimpleEffectAnalysisResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Consumer,java.util.function.Consumer):723:723 -> a
+    50:50: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.conversion.LensCodeRewriter):582 -> a
+    51:53: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.conversion.LensCodeRewriter):590:592 -> a
+    54:60: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.conversion.LensCodeRewriter):591:597 -> a
     61:61:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1225:1225 -> a
-    61:61: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.conversion.LensCodeRewriter):597 -> a
-    62:72: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.conversion.LensCodeRewriter):597:607 -> a
+    61:61: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.conversion.LensCodeRewriter):598 -> a
+    62:72: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.conversion.LensCodeRewriter):598:608 -> a
     73:73:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1225:1225 -> a
-    73:73: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.conversion.LensCodeRewriter):612 -> a
-    74:74: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.conversion.LensCodeRewriter):612:612 -> a
-    75:82: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.conversion.LensCodeRewriter):611:618 -> a
-    83:96: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.conversion.LensCodeRewriter):616:629 -> a
+    73:73: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.conversion.LensCodeRewriter):613 -> a
+    74:74: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.conversion.LensCodeRewriter):613:613 -> a
+    75:82: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.conversion.LensCodeRewriter):612:619 -> a
+    83:96: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.conversion.LensCodeRewriter):617:630 -> a
     97:97: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):1221:1221 -> a
-    97:97: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.conversion.LensCodeRewriter):631 -> a
-    98: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.conversion.LensCodeRewriter):632:671 -> a
-    138:140: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.conversion.LensCodeRewriter):670:672 -> a
+    97:97: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.conversion.LensCodeRewriter):632 -> a
+    98: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.conversion.LensCodeRewriter):633:672 -> a
+    138:140: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.conversion.LensCodeRewriter):671:673 -> a
     141:141:void com.android.tools.r8.ir.code.ConstClass.<init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):33:33 -> a
-    141: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.conversion.LensCodeRewriter):672 -> a
-    142:178: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.conversion.LensCodeRewriter):672:708 -> a
-    179:179:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$2(com.android.tools.r8.ir.code.BasicBlock):634:634 -> a
-    180:180:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):732:732 -> a
-    180:180:void lambda$buildInliningIR$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):564 -> a
+    141: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.conversion.LensCodeRewriter):673 -> a
+    142:178: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.conversion.LensCodeRewriter):673:709 -> a
+    179:179:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$2(com.android.tools.r8.ir.code.BasicBlock):635:635 -> a
+    180:180:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):733:733 -> a
+    180:180:void lambda$buildInliningIR$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):565 -> a
     181:181:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():671:671 -> a
-    181:181:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):735 -> a
+    181:181:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):736 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    181:181:void lambda$buildInliningIR$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):564 -> a
+    181:181:void lambda$buildInliningIR$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):565 -> a
     182:182:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():671:671 -> a
-    182:182:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):735 -> a
-    182:182:void lambda$buildInliningIR$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):564 -> a
-    183:189:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):735:741 -> a
-    183:189:void lambda$buildInliningIR$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):564 -> a
-    190:193:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):746:749 -> a
-    190:193:void lambda$buildInliningIR$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):585 -> a
+    182:182:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):736 -> a
+    182:182:void lambda$buildInliningIR$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):565 -> a
+    183:189:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):736:742 -> a
+    183:189:void lambda$buildInliningIR$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):565 -> a
+    190:193:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):747:750 -> a
+    190:193:void lambda$buildInliningIR$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):586 -> a
     194:194:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():671:671 -> a
-    194:194:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):753 -> a
+    194:194:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):754 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    194:194:void lambda$buildInliningIR$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):585 -> a
+    194:194:void lambda$buildInliningIR$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):586 -> a
     195:195:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():671:671 -> a
-    195:195:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):753 -> a
-    195:195:void lambda$buildInliningIR$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):585 -> a
-    196:204:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):753:761 -> a
-    196:204:void lambda$buildInliningIR$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):585 -> a
-    205:214:void setRemoveInnerFramePositionForReceiverUse(com.android.tools.r8.ir.code.Instruction):766:775 -> a
-    215:215:void setRemoveInnerFramePositionForReceiverUse(com.android.tools.r8.ir.code.Instruction):774:774 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass getDowncastClass():533:533 -> b
-    1:1:void setShouldEnsureStaticInitialization():541:541 -> c
-com.android.tools.r8.ir.optimize.Inliner$InlineResult -> com.android.tools.r8.internal.sq:
-    1:1:void <init>():500:500 -> <init>
+    195:195:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):754 -> a
+    195:195:void lambda$buildInliningIR$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):586 -> a
+    196:204:void com.android.tools.r8.ir.optimize.Inliner$InlineAction.synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):754:762 -> a
+    196:204:void lambda$buildInliningIR$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.BasicBlock):586 -> a
+    205:214:void setRemoveInnerFramePositionForReceiverUse(com.android.tools.r8.ir.code.Instruction):767:776 -> a
+    215:215:void setRemoveInnerFramePositionForReceiverUse(com.android.tools.r8.ir.code.Instruction):775:775 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass getDowncastClass():534:534 -> b
+    1:1:void setShouldEnsureStaticInitialization():542:542 -> c
+com.android.tools.r8.ir.optimize.Inliner$InlineResult -> com.android.tools.r8.internal.xq:
+    1:1:void <init>():501:501 -> <init>
     com.android.tools.r8.ir.optimize.Inliner$InlineAction asInlineAction() -> a
-com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.internal.tq:
+com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.internal.yq:
     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):792:794 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.uq:
+    1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):793:795 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.zq:
     com.android.tools.r8.graph.DexProgramClass receiverClass -> b
     com.android.tools.r8.graph.ProgramMethod target -> a
-    1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):838:840 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.internal.vq:
+    1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):839:841 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$Reason -> com.android.tools.r8.internal.Aq:
     com.android.tools.r8.ir.optimize.Inliner$Reason NEVER -> g
     com.android.tools.r8.ir.optimize.Inliner$Reason MULTI_CALLER_CANDIDATE -> e
     com.android.tools.r8.ir.optimize.Inliner$Reason SIMPLE -> f
     com.android.tools.r8.ir.optimize.Inliner$Reason ALWAYS -> c
     com.android.tools.r8.ir.optimize.Inliner$Reason SINGLE_CALLER -> d
     com.android.tools.r8.ir.optimize.Inliner$Reason FORCE -> b
-    1:8:void <clinit>():485:492 -> <clinit>
-    1:1:void <init>(java.lang.String,int):484:484 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$RetryAction -> com.android.tools.r8.internal.wq:
-    1:1:void <init>():779:779 -> <init>
+    1:8:void <clinit>():486:493 -> <clinit>
+    1:1:void <init>(java.lang.String,int):485:485 -> <init>
+com.android.tools.r8.ir.optimize.Inliner$RetryAction -> com.android.tools.r8.internal.Bq:
+    1:1:void <init>():780:780 -> <init>
 com.android.tools.r8.ir.optimize.InliningConstraints -> com.android.tools.r8.ir.optimize.c:
     com.android.tools.r8.graph.AppView appView -> a
     boolean allowStaticInterfaceMethodCalls -> b
@@ -68567,12 +68780,12 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):196:196 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):287:287 -> g
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):299:299 -> h
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.Bq:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.Gq:
     com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$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.InliningIRProvider,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
     boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.internal.Dq:
+com.android.tools.r8.ir.optimize.InliningStrategy -> com.android.tools.r8.internal.Iq:
     boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     com.android.tools.r8.ir.analysis.type.ClassTypeElement getReceiverTypeOrDefault(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.type.ClassTypeElement) -> a
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
@@ -68586,7 +68799,7 @@
     16:16:boolean setDowncastTypeIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):66 -> a
     17:20:boolean setDowncastTypeIfNeeded(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):66:69 -> a
     com.android.tools.r8.graph.AppView appView() -> b
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.or:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.tr:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     com.android.tools.r8.ir.conversion.MethodConversionOptions conversionOptions -> b
     1:3:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.ir.code.IRCode):17:19 -> <init>
@@ -68595,7 +68808,7 @@
     3:12:int com.android.tools.r8.ir.optimize.InstructionEquivalence.doHash(com.android.tools.r8.ir.code.Instruction):31:40 -> a
     3:12:int doHash(java.lang.Object):13 -> a
     13:14:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):24:25 -> a
-com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.internal.IF:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.internal.PF:
     com.android.tools.r8.graph.DexClass clazz -> a
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set interfaces -> d
@@ -68638,150 +68851,7 @@
     1:2:void linkSubtype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):181:182 -> b
     3:4:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):195:196 -> b
     1:2:void linkSupertype(com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):176:177 -> c
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.TF:
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set warnedFields -> c
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.utils.Reporter reporter -> b
-    1:3:void <clinit>():53:55 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):63:63 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.AppView):61:65 -> <init>
-    1:14: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):143:156 -> a
-    1:14: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):226 -> a
-    15:15:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    15:15: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):156 -> a
-    15:15: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):226 -> a
-    16:18: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):160:162 -> a
-    16:18: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):226 -> a
-    19:19:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    19:19: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):162 -> a
-    19:19: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):226 -> a
-    20:27: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):165:172 -> a
-    20:27: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):226 -> a
-    28:28: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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":108,"2":109,"3":110}}
-    108:108: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):172:172 -> a
-    108:108: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):226 -> a
-    109:109: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):172:172 -> a
-    109:109: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):226 -> a
-    110:110: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):172:172 -> a
-    110:110: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):226 -> a
-    29:29: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):175:175 -> a
-    29:29: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):226 -> a
-    30:41: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):172:183 -> a
-    30:41: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):226 -> a
-    42:45: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):182:185 -> a
-    42:45: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):226 -> a
-    46:46:com.android.tools.r8.ir.code.StaticGet$Builder com.android.tools.r8.ir.code.StaticGet.builder():43:43 -> a
-    46:46: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):185 -> a
-    46:46: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):226 -> a
-    47:47: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):186:186 -> a
-    47:47: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):226 -> a
-    48:48:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):74:74 -> a
-    48:48: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):187 -> a
-    48:48: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):226 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    49:49:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexField.getTypeElement(com.android.tools.r8.graph.AppView):74:74 -> a
-    49:49: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):187 -> a
-    49:49: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):226 -> a
-    50:59: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):187:196 -> a
-    50: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):226 -> a
-    60:60: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):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":134,"2":135,"3":136}}
-    134:134: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):196:196 -> a
-    134:134: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):226 -> a
-    135:135: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):196:196 -> a
-    135:135: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):226 -> a
-    136:136: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):196:196 -> a
-    136:136: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):226 -> a
-    61:63: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):199:201 -> a
-    61:63: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):226 -> a
-    64:64: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):196:196 -> a
-    64:64: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):226 -> a
-    65:66: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):229:230 -> a
-    67:69: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):213:215 -> a
-    67: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):230 -> a
-    70:79: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):234:243 -> a
-    80:80:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    80:80: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):245 -> a
-    81:81: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):246:246 -> a
-    82:82:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    82:82: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):247 -> a
-    83:85: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):248:250 -> a
-    86:107: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):249:270 -> a
-    137:145: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:375 -> a
-    146: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):374:384 -> a
-    157:157:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():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):384 -> a
-    158:161: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):388:391 -> a
-    162: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):390:390 -> a
-    163:163:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    163:163:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):126 -> a
-    163: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):395 -> a
-    164:167:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):127:130 -> a
-    164:167: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):395 -> a
-    168:192: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:424 -> a
-    193:213: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):422:442 -> a
-    214:214:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    214:214: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):443 -> a
-    215:216: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):444:445 -> a
-    217:217:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    217:217: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):449 -> a
-    218:222: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):450:454 -> a
-    223:238: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):453:468 -> a
-    239:239:java.lang.Boolean lambda$rewriteFieldGetWithConstantValues$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):375:375 -> a
-    240:247:void run(com.android.tools.r8.ir.code.IRCode):514:521 -> a
-    248:248:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
-    248:248:void run(com.android.tools.r8.ir.code.IRCode):521 -> a
-    249:252:void run(com.android.tools.r8.ir.code.IRCode):521:524 -> a
-    253:264:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):532:543 -> a
-    265:299:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteArrayGet(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.ArrayGet):75:109 -> a
-    265:299:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):542 -> a
-    300:300:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    300:300:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteArrayGet(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.ArrayGet):109 -> a
-    300:300:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):542 -> a
-    301:312:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteArrayGet(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.ArrayGet):110:121 -> a
-    301:312:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):542 -> a
-    313:315:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):544:546 -> a
-    316:336: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):282:302 -> a
-    316:336:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):545 -> a
-    337:344:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):23:30 -> a
-    337:344: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):302 -> a
-    337:344:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):545 -> a
-    345:345: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):304:304 -> a
-    345:345:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):545 -> a
-    346:346:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    346:346:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):134 -> a
-    346:346: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):309 -> a
-    346:346:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):545 -> a
-    347:350:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):135:138 -> a
-    347:350: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):309 -> a
-    347:350:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):545 -> a
-    351:366: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):314:329 -> a
-    351:366:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):545 -> a
-    367:367:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
-    367:367: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):330 -> a
-    367:367:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):545 -> a
-    368:374: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):331:337 -> a
-    368:374:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):545 -> a
-    375:375:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
-    375:375: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):338 -> a
-    375:375:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):545 -> a
-    376:378: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):339:339 -> a
-    376:378:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):545 -> a
-    383:394: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):344:355 -> a
-    383:394:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):545 -> a
-    395:397:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):547:549 -> a
-    398:401:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):548:551 -> a
-    402:414: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):475:487 -> a
-    402:414:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):551 -> a
-    415:416:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):552:553 -> a
-    417:430: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):492:505 -> a
-    417:430:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):553 -> a
-    431:431: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):504:504 -> a
-    431:431:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):553 -> a
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.EG:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.LG:
     java.util.Map com.android.tools.r8.ir.optimize.MemberPoolCollection.memberPools -> d
     com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> b
     com.android.tools.r8.com.google.common.base.Equivalence com.android.tools.r8.ir.optimize.MemberPoolCollection.equivalence -> a
@@ -68879,7 +68949,7 @@
     1:1:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):155:155 -> d
     2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):273:273 -> d
     2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):155 -> d
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.vH:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.CH:
     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>
@@ -68887,7 +68957,7 @@
     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.MultiCallerInliner -> com.android.tools.r8.internal.HH:
+com.android.tools.r8.ir.optimize.MultiCallerInliner -> com.android.tools.r8.internal.OH:
     com.android.tools.r8.graph.AppView appView -> a
     int[] multiCallerInliningInstructionLimits -> c
     com.android.tools.r8.utils.collections.ProgramMethodMap multiInlineCallEdges -> b
@@ -68924,7 +68994,7 @@
     54:54:boolean lambda$stopTrackingCallSitesForMethodIfDefinitelyIneligibleForMultiCallerInlining$3(com.android.tools.r8.graph.ProgramMethod):160:160 -> b
     55:55:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder lambda$onLastWaveDone$6(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph):200:200 -> b
     1:1:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):186:186 -> c
-com.android.tools.r8.ir.optimize.NaturalIntLoopRemover -> com.android.tools.r8.internal.nI:
+com.android.tools.r8.ir.optimize.NaturalIntLoopRemover -> com.android.tools.r8.internal.uI:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>():30:30 -> <init>
@@ -69004,7 +69074,7 @@
     149:152:boolean com.android.tools.r8.ir.optimize.NaturalIntLoopRemover.tryRemoveLoop(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.If):94:97 -> a
     149:152:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):39 -> a
     153:154:void run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):43:44 -> a
-com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations -> com.android.tools.r8.internal.mI:
+com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations -> com.android.tools.r8.internal.tI:
     com.android.tools.r8.ir.code.If comparison -> c
     java.util.Set loopBody -> g
     com.android.tools.r8.ir.code.BasicBlock backPredecessor -> f
@@ -69047,7 +69117,7 @@
     45:47:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.patchControlFlow(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):397:399 -> a
     45:47:void com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations.remove1IterationLoop(com.android.tools.r8.ir.code.IRCode):388 -> a
     45:47:void access$000(com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations,com.android.tools.r8.ir.code.IRCode):272 -> a
-com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder -> com.android.tools.r8.internal.lI:
+com.android.tools.r8.ir.optimize.NaturalIntLoopRemover$NaturalIntLoopWithKnowIterations$Builder -> com.android.tools.r8.internal.sI:
     com.android.tools.r8.ir.code.If comparison -> c
     com.android.tools.r8.ir.code.BasicBlock backPredecessor -> g
     java.util.Set loopBody -> h
@@ -69068,7 +69138,7 @@
     1:1:int getCounterIncrement():319:319 -> c
     1:1:com.android.tools.r8.ir.code.BasicBlock getLoopEntry():327:327 -> d
     1:1:com.android.tools.r8.ir.code.BasicBlock getLoopExit():348:348 -> e
-com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.wI:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.DI:
     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
@@ -69094,7 +69164,7 @@
     3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):42:42 -> c
     3:3:void processNestMember(com.android.tools.r8.graph.DexProgramClass):100 -> c
     4:6:void processNestMember(com.android.tools.r8.graph.DexProgramClass):100:102 -> c
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.xI:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.EI:
     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
@@ -69105,10 +69175,10 @@
     24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> 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):41:41 -> a
+    33:33:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> 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):41:41 -> a
+    36:36:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> 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
@@ -69116,9 +69186,9 @@
     43:43:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> 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:54:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):73:83 -> a
-    55:55:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    55:55:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     55:55: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.OutlinerImpl -> com.android.tools.r8.internal.wN:
+com.android.tools.r8.ir.optimize.OutlinerImpl -> com.android.tools.r8.internal.NN:
     java.util.Map outlineSites -> b
     java.util.Map generatedOutlines -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
@@ -69172,10 +69242,10 @@
     136:136:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$buildOutlineMethods$7(com.android.tools.r8.synthesis.SyntheticNaming):1528:1528 -> a
     137:137:void lambda$buildOutlineMethods$9(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1534:1534 -> a
     138:147:void lambda$buildOutlineMethods$9(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1533:1542 -> a
-    148:148:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    148:148:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     148:148:void lambda$buildOutlineMethods$9(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1542 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    149:149:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    149:149:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     149:149:void lambda$buildOutlineMethods$9(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1542 -> a
     150:150:void lambda$buildOutlineMethods$9(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1544:1544 -> a
     151:151:void lambda$buildOutlineMethods$9(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1543:1543 -> a
@@ -69223,7 +69293,7 @@
     29:50:java.util.List buildOutlineMethods():1527:1548 -> c
     1:1:java.util.Map access$300(com.android.tools.r8.ir.optimize.OutlinerImpl):120:120 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.OutlinerImpl):120:120 -> e
-com.android.tools.r8.ir.optimize.OutlinerImpl$BinOpOutlineInstruction -> com.android.tools.r8.internal.kN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$BinOpOutlineInstruction -> com.android.tools.r8.internal.BN:
     com.android.tools.r8.ir.code.NumericType numericType -> c
     1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType,com.android.tools.r8.ir.code.NumericType):229:230 -> <init>
     boolean needsLensRewriting(com.android.tools.r8.graph.GraphLens) -> a
@@ -69280,7 +69350,7 @@
     1:1:int com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction.hashCode():199:199 -> hashCode
     1:1:int hashCode():241 -> hashCode
     2:2:int hashCode():241:241 -> hashCode
-com.android.tools.r8.ir.optimize.OutlinerImpl$InvokeOutlineInstruction -> com.android.tools.r8.internal.lN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$InvokeOutlineInstruction -> com.android.tools.r8.internal.CN:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> d
     com.android.tools.r8.graph.DexProto proto -> f
     boolean hasOutValue -> e
@@ -69330,7 +69400,7 @@
     1:1:int com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction.hashCode():199:199 -> hashCode
     1:1:int hashCode():439 -> hashCode
     2:6:int hashCode():439:443 -> hashCode
-com.android.tools.r8.ir.optimize.OutlinerImpl$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.mN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.DN:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):336:337 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction):357:357 -> a
@@ -69361,7 +69431,7 @@
     1:1:int com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction.hashCode():199:199 -> hashCode
     1:1:int hashCode():352 -> hashCode
     2:2:int hashCode():352:352 -> hashCode
-com.android.tools.r8.ir.optimize.OutlinerImpl$Outline -> com.android.tools.r8.internal.nN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$Outline -> com.android.tools.r8.internal.EN:
     java.util.List argumentTypes -> b
     java.util.List templateInstructions -> d
     java.util.List argumentMap -> c
@@ -69406,7 +69476,7 @@
     1:18:boolean equals(java.lang.Object):638:655 -> equals
     1:6:int hashCode():663:668 -> hashCode
     1:37:java.lang.String toString():724:760 -> toString
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineCode -> com.android.tools.r8.internal.oN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineCode -> com.android.tools.r8.internal.FN:
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> e
     com.android.tools.r8.ir.optimize.OutlinerImpl$Outline outline -> d
     1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1772:1773 -> <init>
@@ -69419,7 +69489,7 @@
     int estimatedDexCodeSizeUpperBoundInBytes() -> p0
     int estimatedSizeForInlining() -> q0
     1:1:java.lang.String toString():1809:1809 -> toString
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction -> com.android.tools.r8.internal.qN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction -> com.android.tools.r8.internal.HN:
     com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType type -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():140:140 -> <clinit>
@@ -69432,18 +69502,18 @@
     java.lang.String getInstructionName() -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.pN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineInstruction$OutlineInstructionType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.GN:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String name(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineMethodIdentifier -> com.android.tools.r8.internal.rN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineMethodIdentifier -> com.android.tools.r8.internal.IN:
     java.util.List outlinesForMethod -> p
     1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List,java.util.List):1189:1190 -> <init>
     1:1:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1195:1195 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineRewriter -> com.android.tools.r8.internal.sN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineRewriter -> com.android.tools.r8.internal.JN:
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> t
     boolean $assertionsDisabled -> u
     com.android.tools.r8.ir.code.IRCode code -> p
@@ -69461,7 +69531,7 @@
     28:33:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1263 -> a
     34:63:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1264:1293 -> a
     64:69:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1290:1295 -> a
-    70:70:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
+    70:70:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():37:37 -> a
     70:70:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1296 -> a
     71:73:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1297:1299 -> a
     74:76:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1305:1307 -> a
@@ -69470,12 +69540,12 @@
     82:82:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1309:1309 -> a
     83:87:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1306:1310 -> a
     88:88:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1308:1308 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSiteIdentifier -> com.android.tools.r8.internal.tN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSiteIdentifier -> com.android.tools.r8.internal.KN:
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> p
     1:2:void <init>(com.android.tools.r8.ir.optimize.OutlinerImpl,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,java.util.List):1202:1203 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1208:1210 -> a
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline):1209:1209 -> a
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSourceCode -> com.android.tools.r8.internal.uN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSourceCode -> com.android.tools.r8.internal.LN:
     com.android.tools.r8.ir.optimize.OutlinerImpl$Outline outline -> a
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> e
     boolean $assertionsDisabled -> f
@@ -69512,7 +69582,7 @@
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1748:1748 -> e
     1:1:int getMoveExceptionRegister(int):1736:1736 -> f
     int instructionOffset(int) -> g
-com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSpotter -> com.android.tools.r8.internal.vN:
+com.android.tools.r8.ir.optimize.OutlinerImpl$OutlineSpotter -> com.android.tools.r8.internal.MN:
     com.android.tools.r8.graph.DexType returnType -> j
     int returnValueUniqueUsersLeft -> l
     com.android.tools.r8.ir.optimize.OutlinerImpl this$0 -> n
@@ -69656,13 +69726,13 @@
     262:291:void candidate(int,int):1130:1159 -> a
     292:302:void reset(int):1164:1174 -> a
     1:7:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):975:981 -> b
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> b
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> b
     8:8:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):981 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> b
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> b
     9:9:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):981 -> b
     10:16:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):984:990 -> b
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.RN:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.iO:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():36:36 -> <clinit>
     1:1:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):42:42 -> a
@@ -69783,7 +69853,7 @@
     428:428:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):468 -> a
     429:432:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):468:471 -> a
     1:1:java.util.List lambda$shareIdenticalBlockSuffix$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):273:273 -> b
-com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.UN:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.mO:
     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
     7:8:boolean com.android.tools.r8.ir.optimize.PhiOptimizations.predecessorsHaveNormalFlow(com.android.tools.r8.ir.code.BasicBlock):28:29 -> b
@@ -69831,7 +69901,7 @@
     39:50:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     51:64: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
     51:64:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination -> com.android.tools.r8.internal.PS:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination -> com.android.tools.r8.internal.kT:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState activeState -> h
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> j
@@ -69859,10 +69929,10 @@
     13:20:void lambda$processInstructionsToRemove$1(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):424:431 -> a
     21:21:boolean lambda$processInstructionsToRemove$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):423:423 -> a
     22:22:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):452:452 -> a
-    23:23:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    23:23:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     23:23:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):452 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:24:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    24:24:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     24:24:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):452 -> a
     25:45:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):453:473 -> a
     46:46:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):461:461 -> a
@@ -69876,47 +69946,56 @@
     75:79:void markMostRecentInitClassForRemoval(com.android.tools.r8.graph.DexType):552:556 -> a
     80:89:void markAssumeDynamicTypeUsersForRemoval(com.android.tools.r8.ir.code.FieldGet,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue,com.android.tools.r8.ir.optimize.AssumeRemover):648:657 -> a
     90:92:boolean lambda$markAssumeDynamicTypeUsersForRemoval$3(com.android.tools.r8.ir.code.FieldGet,com.android.tools.r8.ir.code.Instruction):654:656 -> a
-    93:106:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):664:677 -> a
-    107:107:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
-    107:107:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):677 -> a
+    93:97:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):664:668 -> a
+    98:98:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
+    98:98:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):668 -> a
+    99:99:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
+    99:99:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):668 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    108:108:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
-    108:108:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):677 -> a
-    109:110:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):677:678 -> a
-    111:114:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.verifyWasInstanceInitializer():440:443 -> a
-    111:114:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):679 -> a
-    115:119:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.verifyWasInstanceInitializer():442:446 -> a
-    115:119:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):679 -> a
-    120:120:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    120:120:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.verifyWasInstanceInitializer():446 -> a
+    100:108:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):669:677 -> a
+    109:109:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
+    109:109:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):677 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    120:120:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):679 -> a
-    121:121:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.verifyWasInstanceInitializer():446:446 -> a
-    121:121:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):679 -> a
-    122:125:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.verifyWasInstanceInitializer():444:447 -> a
-    122:125:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):679 -> a
-    126:137:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):680:691 -> a
-    138:145:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):690:697 -> a
-    146:146:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):754:754 -> a
-    147:147:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):548:548 -> a
-    147:147:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):754 -> a
-    148:170:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):757:779 -> a
-    171:179:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):778:786 -> a
-    180:181:void applyObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):790:791 -> a
-    182:186:void lambda$applyObjectState$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):793:797 -> a
-    187:191:void killAllNonFinalActiveFields():805:809 -> a
-    192:192:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):813:813 -> a
-    193:193:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
-    193:193:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):813 -> a
-    194:202:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):813:821 -> a
-    203:203:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
-    203:203:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):823 -> a
-    204:204:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    204:204:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):823 -> a
-    205:205:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    205:205:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):830 -> a
-    206:206:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):831:831 -> a
-    207:211:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):824:828 -> a
+    110:110:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
+    110:110:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):677 -> a
+    111:112:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):677:678 -> a
+    113:116:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.verifyWasInstanceInitializer():440:443 -> a
+    113:116:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):679 -> a
+    117:121:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.verifyWasInstanceInitializer():442:446 -> a
+    117:121:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):679 -> a
+    122:122:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    122:122:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.verifyWasInstanceInitializer():446 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    122:122:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):679 -> a
+    123:123:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.verifyWasInstanceInitializer():446:446 -> a
+    123:123:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):679 -> a
+    124:127:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.verifyWasInstanceInitializer():444:447 -> a
+    124:127:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):679 -> a
+    128:139:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):680:691 -> a
+    140:147:void handleInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.graph.DexClassAndField):690:697 -> a
+    148:148:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):754:754 -> a
+    149:149:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):548:548 -> a
+    149:149:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):754 -> a
+    150:154:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):757:761 -> a
+    155:155:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
+    155:155:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):761 -> a
+    156:173:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):762:779 -> a
+    174:182:void handleStaticPut(com.android.tools.r8.ir.code.StaticPut,com.android.tools.r8.graph.DexClassAndField):778:786 -> a
+    183:184:void applyObjectState(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState):790:791 -> a
+    185:189:void lambda$applyObjectState$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):793:797 -> a
+    190:194:void killAllNonFinalActiveFields():805:809 -> a
+    195:195:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):813:813 -> a
+    196:196:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
+    196:196:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):813 -> a
+    197:205:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):813:821 -> a
+    206:206:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
+    206:206:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):823 -> a
+    207:207:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    207:207:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):823 -> a
+    208:208:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    208:208:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):830 -> a
+    209:209:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):831:831 -> a
+    210:214:void killNonFinalActiveFields(com.android.tools.r8.ir.code.Instruction):824:828 -> a
     1:1:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):63:63 -> b
     2:2:void processInstructionsToRemove():420:420 -> b
     3:3:java.lang.Boolean lambda$handleStaticPut$4(com.android.tools.r8.graph.DexClassAndField):768:768 -> b
@@ -69962,148 +70041,196 @@
     79:79:void run():336:336 -> c
     80:80:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):609:609 -> c
     80:80:void run():336 -> c
-    81:84:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):639:642 -> c
-    81:84:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):610 -> c
-    81:84:void run():336 -> c
-    85:95:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):614:624 -> c
-    85:95:void run():336 -> c
-    96:99:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):639:642 -> c
-    96:99:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):625 -> c
-    96:99:void run():336 -> c
-    100:101:void run():337:338 -> c
-    102:102:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> c
-    102:102:void run():339 -> c
-    103:103:void run():340:340 -> c
-    104:104:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):705:705 -> c
-    104:104:void run():340 -> c
-    105:105:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):548:548 -> c
-    105:105:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):705 -> c
-    105:105:void run():340 -> c
-    106:107:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):707:708 -> c
-    106:107:void run():340 -> c
-    108:111:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):746:749 -> c
-    108:111:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):709 -> c
-    108:111:void run():340 -> c
-    112:120:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):713:721 -> c
-    112:120:void run():340 -> c
-    121:124:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):746:749 -> c
-    121:124:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):722 -> c
-    121:124:void run():340 -> c
-    125:132:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):724:731 -> c
-    125:132:void run():340 -> c
-    133:133:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> c
-    133:133:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):731 -> c
+    81:81:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):639:639 -> c
+    81:81:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):610 -> c
+    81:81:void run():336 -> c
+    82:82:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> c
+    82:82:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):639 -> c
+    82:82:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):610 -> c
+    82:82:void run():336 -> c
+    83:83:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> c
+    83:83:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):639 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    133:133:void run():340 -> c
-    134:134:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> c
-    134:134:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):731 -> c
-    134:134:void run():340 -> c
-    135:142:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):733:740 -> c
-    135:142:void run():340 -> c
-    143:144:void run():341:342 -> c
-    145:145:void run():331:331 -> c
-    146:146:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> c
-    146:146:void run():344 -> c
-    147:147:void run():345:345 -> c
-    148:148:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> c
-    148:148:void run():346 -> c
-    149:149:void run():347:347 -> c
-    150:160:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):527:537 -> c
-    150:160:void run():347 -> c
-    161:161:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):548:548 -> c
-    161:161:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):538 -> c
-    161:161:void run():347 -> c
-    162:166:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):539:543 -> c
-    162:166:void run():347 -> c
-    167:167:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> c
-    167:167:void run():348 -> c
-    168:172:void run():349:353 -> c
-    173:173:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> c
-    173:173:void run():354 -> c
-    174:174:void run():355:355 -> c
-    175:175:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):510:510 -> c
-    175:175:void run():355 -> c
-    176:176:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> c
-    176:176:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):510 -> c
+    83:83:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):610 -> c
+    83:83:void run():336 -> c
+    84:86:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):640:642 -> c
+    84:86:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):610 -> c
+    84:86:void run():336 -> c
+    87:97:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):614:624 -> c
+    87:97:void run():336 -> c
+    98:98:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):639:639 -> c
+    98:98:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):625 -> c
+    98:98:void run():336 -> c
+    99:99:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> c
+    99:99:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):639 -> c
+    99:99:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):625 -> c
+    99:99:void run():336 -> c
+    100:100:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> c
+    100:100:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):639 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    176:176:void run():355 -> c
-    177:177:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> c
-    177:177:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):510 -> c
-    177:177:void run():355 -> c
-    178:185:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):511:518 -> c
-    178:185:void run():355 -> c
-    186:186:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):548:548 -> c
-    186:186:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):518 -> c
-    186:186:void run():355 -> c
-    187:191:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):519:523 -> c
-    187:191:void run():355 -> c
-    192:192:void run():356:356 -> c
-    193:193:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> c
-    193:193:void run():356 -> c
-    194:195:void run():358:359 -> c
-    196:196:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):629:629 -> c
-    196:196:void run():359 -> c
-    197:197:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):548:548 -> c
-    197:197:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):629 -> c
-    197:197:void run():359 -> c
-    198:200:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):630:632 -> c
-    198:200:void run():359 -> c
-    201:213:void run():363:375 -> c
-    214:214:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> c
-    214:214:void run():376 -> c
-    215:218:void run():377:380 -> c
-    219:219:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> c
-    219:219:void run():381 -> c
-    220:220:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodHandle():0:0 -> c
-    220:220:void run():382 -> c
-    221:221:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodType():0:0 -> c
-    221:221:void run():383 -> c
-    222:222:void run():384:384 -> c
-    223:223:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> c
-    223:223:void run():385 -> c
-    224:224:void run():386:386 -> c
-    225:225:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> c
-    225:225:void run():387 -> c
-    226:227:void run():388:389 -> c
-    228:228:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> c
-    228:228:void run():390 -> c
-    229:229:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> c
-    229:229:void run():391 -> c
-    230:230:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> c
-    230:230:void run():392 -> c
-    231:231:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> c
-    231:231:void run():393 -> c
-    232:232:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> c
-    232:232:void run():394 -> c
-    233:237:void run():395:399 -> c
-    238:238:boolean com.android.tools.r8.ir.code.Instruction.isRecordFieldValues():0:0 -> c
-    238:238:void run():400 -> c
-    239:239:void run():374:374 -> c
-    240:240:void run():0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":658,"2":659,"3":660}}
-    658:658:void run():374:374 -> c
-    659:659:void run():374:374 -> c
-    660:660:void run():374:374 -> c
-    641:641:void run():401:401 -> c
-    642:642:void run():357:357 -> c
-    643:643:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():278:278 -> c
-    643:643:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():282 -> c
-    643:643:void run():404 -> c
-    644:644:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():282:282 -> c
-    644:644:void run():404 -> c
-    645:654:void run():405:414 -> c
-    655:655:com.android.tools.r8.ir.optimize.AssumeRemover com.android.tools.r8.ir.optimize.AssumeRemover.removeMarkedInstructions():104:104 -> c
-    655:655:void run():415 -> c
-    656:657:void run():415:416 -> c
+    100:100:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):625 -> c
+    100:100:void run():336 -> c
+    101:103:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentInstanceFieldWrite(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField):640:642 -> c
+    101:103:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInstanceGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):625 -> c
+    101:103:void run():336 -> c
+    104:105:void run():337:338 -> c
+    106:106:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> c
+    106:106:void run():339 -> c
+    107:107:void run():340:340 -> c
+    108:108:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):705:705 -> c
+    108:108:void run():340 -> c
+    109:109:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):548:548 -> c
+    109:109:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):705 -> c
+    109:109:void run():340 -> c
+    110:111:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):707:708 -> c
+    110:111:void run():340 -> c
+    112:112:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):746:746 -> c
+    112:112:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):709 -> c
+    112:112:void run():340 -> c
+    113:113:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> c
+    113:113:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):746 -> c
+    113:113:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):709 -> c
+    113:113:void run():340 -> c
+    114:114:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> c
+    114:114:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):746 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    114:114:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):709 -> c
+    114:114:void run():340 -> c
+    115:117:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):747:749 -> c
+    115:117:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):709 -> c
+    115:117:void run():340 -> c
+    118:126:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):713:721 -> c
+    118:126:void run():340 -> c
+    127:127:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):746:746 -> c
+    127:127:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):722 -> c
+    127:127:void run():340 -> c
+    128:128:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> c
+    128:128:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):746 -> c
+    128:128:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):722 -> c
+    128:128:void run():340 -> c
+    129:129:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> c
+    129:129:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):746 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    129:129:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):722 -> c
+    129:129:void run():340 -> c
+    130:132:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.clearMostRecentStaticFieldWrite(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField):747:749 -> c
+    130:132:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):722 -> c
+    130:132:void run():340 -> c
+    133:140:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):724:731 -> c
+    133:140:void run():340 -> c
+    141:141:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> c
+    141:141:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):731 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    141:141:void run():340 -> c
+    142:142:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> c
+    142:142:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):731 -> c
+    142:142:void run():340 -> c
+    143:150:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleStaticGet(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.ir.optimize.AssumeRemover):733:740 -> c
+    143:150:void run():340 -> c
+    151:152:void run():341:342 -> c
+    153:153:void run():331:331 -> c
+    154:154:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> c
+    154:154:void run():344 -> c
+    155:155:void run():345:345 -> c
+    156:156:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> c
+    156:156:void run():346 -> c
+    157:157:void run():347:347 -> c
+    158:168:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):527:537 -> c
+    158:168:void run():347 -> c
+    169:169:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):548:548 -> c
+    169:169:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):538 -> c
+    169:169:void run():347 -> c
+    170:174:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInitClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InitClass):539:543 -> c
+    170:174:void run():347 -> c
+    175:175:boolean com.android.tools.r8.ir.code.Instruction.isMonitor():0:0 -> c
+    175:175:void run():348 -> c
+    176:180:void run():349:353 -> c
+    181:181:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> c
+    181:181:void run():354 -> c
+    182:182:void run():355:355 -> c
+    183:183:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):510:510 -> c
+    183:183:void run():355 -> c
+    184:184:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> c
+    184:184:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):510 -> c
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    184:184:void run():355 -> c
+    185:185:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> c
+    185:185:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):510 -> c
+    185:185:void run():355 -> c
+    186:193:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):511:518 -> c
+    186:193:void run():355 -> c
+    194:194:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):548:548 -> c
+    194:194:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):518 -> c
+    194:194:void run():355 -> c
+    195:199:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic):519:523 -> c
+    195:199:void run():355 -> c
+    200:200:void run():356:356 -> c
+    201:201:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> c
+    201:201:void run():356 -> c
+    202:203:void run():358:359 -> c
+    204:204:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):629:629 -> c
+    204:204:void run():359 -> c
+    205:205:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.markClassAsInitialized(com.android.tools.r8.graph.DexType):548:548 -> c
+    205:205:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):629 -> c
+    205:205:void run():359 -> c
+    206:208:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination.handleNewInstance(com.android.tools.r8.ir.code.NewInstance):630:632 -> c
+    206:208:void run():359 -> c
+    209:221:void run():363:375 -> c
+    222:222:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> c
+    222:222:void run():376 -> c
+    223:226:void run():377:380 -> c
+    227:227:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> c
+    227:227:void run():381 -> c
+    228:228:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodHandle():0:0 -> c
+    228:228:void run():382 -> c
+    229:229:boolean com.android.tools.r8.ir.code.Instruction.isConstMethodType():0:0 -> c
+    229:229:void run():383 -> c
+    230:230:void run():384:384 -> c
+    231:231:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> c
+    231:231:void run():385 -> c
+    232:232:void run():386:386 -> c
+    233:233:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> c
+    233:233:void run():387 -> c
+    234:235:void run():388:389 -> c
+    236:236:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> c
+    236:236:void run():390 -> c
+    237:237:boolean com.android.tools.r8.ir.code.Instruction.isInvokeMultiNewArray():0:0 -> c
+    237:237:void run():391 -> c
+    238:238:boolean com.android.tools.r8.ir.code.Instruction.isInvokeNewArray():0:0 -> c
+    238:238:void run():392 -> c
+    239:239:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> c
+    239:239:void run():393 -> c
+    240:240:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> c
+    240:240:void run():394 -> c
+    241:245:void run():395:399 -> c
+    246:246:boolean com.android.tools.r8.ir.code.Instruction.isRecordFieldValues():0:0 -> c
+    246:246:void run():400 -> c
+    247:247:void run():374:374 -> c
+    248:248:void run():0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":666,"2":667,"3":668}}
+    666:666:void run():374:374 -> c
+    667:667:void run():374:374 -> c
+    668:668:void run():374:374 -> c
+    649:649:void run():401:401 -> c
+    650:650:void run():357:357 -> c
+    651:651:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessor():278:278 -> c
+    651:651:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():282 -> c
+    651:651:void run():404 -> c
+    652:652:boolean com.android.tools.r8.ir.code.BasicBlock.hasUniqueNormalSuccessorWithUniquePredecessor():282:282 -> c
+    652:652:void run():404 -> c
+    653:662:void run():405:414 -> c
+    663:663:com.android.tools.r8.ir.optimize.AssumeRemover com.android.tools.r8.ir.optimize.AssumeRemover.removeMarkedInstructions():104:104 -> c
+    663:663:void run():415 -> c
+    664:665:void run():415:416 -> c
     1:1:com.android.tools.r8.ir.code.IRCode access$300(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination):63:63 -> d
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot -> com.android.tools.r8.internal.GS:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot -> com.android.tools.r8.internal.bT:
     com.android.tools.r8.ir.code.MemberType memberType -> b
     com.android.tools.r8.ir.code.Value array -> a
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1):158:158 -> <init>
     2:4:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType):163:165 -> <init>
     boolean maybeHasIndex(int) -> a
     1:5:com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot create(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType):169:173 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlotWithConstantIndex -> com.android.tools.r8.internal.HS:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlotWithConstantIndex -> com.android.tools.r8.internal.cT:
     int index -> c
     1:1:void <init>(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1):187:187 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.MemberType):192:193 -> <init>
@@ -70112,7 +70239,7 @@
     6:6:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot.baseEquals(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot):183:183 -> equals
     6:6:boolean equals(java.lang.Object):215 -> equals
     1:1:int hashCode():203:203 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlotWithValueIndex -> com.android.tools.r8.internal.IS:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlotWithValueIndex -> com.android.tools.r8.internal.dT:
     com.android.tools.r8.ir.code.Value index -> c
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1):219:219 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.MemberType):224:225 -> <init>
@@ -70121,7 +70248,7 @@
     6:6:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot.baseEquals(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ArraySlot):183:183 -> equals
     6:6:boolean equals(java.lang.Object):247 -> equals
     1:1:int hashCode():235:235 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState -> com.android.tools.r8.internal.JS:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState -> com.android.tools.r8.internal.eT:
     java.util.LinkedHashMap arraySlotValues -> a
     java.util.LinkedHashSet initializedClasses -> d
     int maxCapacity -> j
@@ -70239,7 +70366,7 @@
     4:4:int com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState.size(java.util.Set):1372:1372 -> i
     4:4:int size():1364 -> i
     5:9:int size():1364:1368 -> i
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates -> com.android.tools.r8.internal.KS:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates -> com.android.tools.r8.internal.fT:
     java.util.LinkedHashMap activeStateAtExit -> a
     int capacity -> b
     boolean $assertionsDisabled -> c
@@ -70276,7 +70403,7 @@
     80:80:void com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):902:902 -> a
     80:80:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):933 -> a
     81:83:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$BlockState):934:936 -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ExistingValue -> com.android.tools.r8.internal.LS:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ExistingValue -> com.android.tools.r8.internal.gT:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination this$0 -> b
     com.android.tools.r8.ir.code.Value value -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1):110:110 -> <init>
@@ -70290,7 +70417,7 @@
     140:140:java.lang.String toString():137:137 -> toString
     141:141:java.lang.String toString():137:137 -> toString
     138:138:java.lang.String toString():137:137 -> toString
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject -> com.android.tools.r8.internal.MS:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject -> com.android.tools.r8.internal.hT:
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.ir.code.Value object -> b
     boolean $assertionsDisabled -> c
@@ -70300,10 +70427,10 @@
     1:1:com.android.tools.r8.graph.DexField access$1100(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldAndObject):251:251 -> a
     1:5:boolean equals(java.lang.Object):268:272 -> equals
     1:1:int hashCode():263:263 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue -> com.android.tools.r8.internal.NS:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$FieldValue -> com.android.tools.r8.internal.iT:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$ExistingValue asExistingValue() -> a
     void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction) -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$MaterializableValue -> com.android.tools.r8.internal.OS:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$MaterializableValue -> com.android.tools.r8.internal.jT:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination this$0 -> b
     com.android.tools.r8.ir.analysis.value.SingleValue value -> a
     boolean $assertionsDisabled -> c
@@ -70311,10 +70438,10 @@
     1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination,com.android.tools.r8.ir.analysis.value.SingleValue,com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination$1):141:141 -> <init>
     2:4:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadAndStoreElimination,com.android.tools.r8.ir.analysis.value.SingleValue):145:147 -> <init>
     1:3:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):152:154 -> a
-    4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):41:41 -> a
     4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):154 -> a
     5:5:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):153:153 -> a
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.rU:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.MU:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     1:11:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):41:51 -> a
@@ -70347,7 +70474,7 @@
     76:86:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
     87:87: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):276:276 -> a
     87:87:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):57 -> a
-    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    88:88:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     88:88:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):184 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     88:88: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):276 -> a
@@ -70381,15 +70508,15 @@
     179:179:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):111 -> a
     180:201:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):111:132 -> a
     202:216:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):131:145 -> a
-    217:217:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    217:217:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     217:217:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    218:218:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    218:218:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     218:218:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):145 -> a
     219:221:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):146:148 -> a
     222:222:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):147:147 -> a
     223:225:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):121:123 -> a
-com.android.tools.r8.ir.optimize.RuntimeWorkaroundCodeRewriter -> com.android.tools.r8.internal.nW:
+com.android.tools.r8.ir.optimize.RuntimeWorkaroundCodeRewriter -> com.android.tools.r8.internal.IW:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():33:33 -> <clinit>
     boolean lambda$workaroundDex2OatLinkedListBug$1(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
@@ -70400,7 +70527,7 @@
     3:4:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():702:703 -> a
     3:4:void workaroundDex2OatInliningIssue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):40 -> a
     5:16:void workaroundDex2OatInliningIssue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):47:58 -> a
-    17:17:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():38:38 -> a
+    17:17:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():37:37 -> a
     17:17:void workaroundDex2OatInliningIssue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59 -> a
     18:25:void workaroundDex2OatInliningIssue(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60:67 -> a
     26:41:void workaroundDex2OatLinkedListBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):85:100 -> a
@@ -70441,7 +70568,7 @@
     13:13:boolean com.android.tools.r8.ir.code.Instruction.isNeg():0:0 -> c
     13:13:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):261 -> c
     14:46:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):262:294 -> c
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.BW:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.WW:
     java.util.List serviceLoadMethods -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> c
@@ -70460,10 +70587,10 @@
     33:95:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):113:175 -> a
     96:109:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):174:187 -> a
     110:111:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):178:179 -> a
-    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    112:112:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     112:112:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):179 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    113:113:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    113:113:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     113:113:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):179 -> a
     114:114:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):181:181 -> a
     115:115:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):180:180 -> a
@@ -70513,7 +70640,7 @@
     274:274:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):174 -> a
     274:274: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):114 -> a
     274:274:com.android.tools.r8.graph.Code lambda$createSynthesizedMethod$3(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.DexMethod):214 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.AW:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.VW:
     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
@@ -70530,7 +70657,7 @@
     31:31:void lambda$perform$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Instruction):268 -> a
     32:33:void lambda$perform$0(com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.ir.code.Instruction):268:269 -> a
     34:34:boolean lambda$perform$1(com.android.tools.r8.ir.code.Instruction):273:273 -> a
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis -> com.android.tools.r8.internal.dX:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis -> com.android.tools.r8.internal.yX:
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult NO_RESULT -> a
     boolean $assertionsDisabled -> b
     1:218:void <clinit>():31:248 -> <clinit>
@@ -70560,7 +70687,7 @@
     151:151:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult triggersClassInitializationBeforeAnyStaticRead(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):348 -> a
     152:152:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect lambda$triggersClassInitializationBeforeAnyStaticRead$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):352:352 -> a
     153:171:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect lambda$triggersClassInitializationBeforeAnyStaticRead$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Instruction):351:369 -> a
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$1 -> com.android.tools.r8.internal.WW:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$1 -> com.android.tools.r8.internal.rX:
     com.android.tools.r8.utils.IntBox val$visitedInstructions -> f
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis val$analysis -> g
@@ -70579,21 +70706,21 @@
     31:31:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):288:288 -> a
     32:34:com.android.tools.r8.utils.TraversalContinuation process(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.function.Function):287:289 -> a
     35:43:com.android.tools.r8.utils.TraversalContinuation joiner(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState,java.util.List):296:304 -> a
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis -> com.android.tools.r8.internal.XW:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionAnalysis -> com.android.tools.r8.internal.sX:
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect analyze(com.android.tools.r8.ir.code.Instruction) -> a
     int maxNumberOfInstructions() -> a
     1:1:java.util.List getSuccessors(com.android.tools.r8.ir.code.BasicBlock):161:161 -> a
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.YW:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.tX:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect.$assertionsDisabled -> a
     1:1:void com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$InstructionEffect.<clinit>():33:33 -> <clinit>
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.ZW:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.uX:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState.isNotComputed() -> a
     boolean com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState.isPartial() -> b
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks -> com.android.tools.r8.internal.aX:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks -> com.android.tools.r8.internal.vX:
     java.util.List failingBlocks -> b
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState state -> a
     boolean $assertionsDisabled -> c
@@ -70606,7 +70733,7 @@
     9:12:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks joinChildren(java.util.List):128 -> a
     13:25:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks joinChildren(java.util.List):130:142 -> a
     1:1:java.util.List access$500(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultStateWithPartialBlocks):110:110 -> b
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult -> com.android.tools.r8.internal.bX:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult -> com.android.tools.r8.internal.wX:
     java.util.List satisfyingInstructions -> b
     java.util.List topmostNotSatisfiedBlocks -> c
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState result -> a
@@ -70619,7 +70746,7 @@
     2:2:java.util.List getTopmostNotSatisfiedBlocks():192:192 -> a
     1:1:boolean isNotSatisfied():200:200 -> b
     1:1:boolean isPartial():208:208 -> c
-com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder -> com.android.tools.r8.internal.cX:
+com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder -> com.android.tools.r8.internal.xX:
     java.util.List failingBlocksForPartialResults -> b
     java.util.List satisfyingInstructions -> a
     com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState result -> c
@@ -70628,7 +70755,7 @@
     1:1:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResultBuilder setResult(com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$ResultState):234:234 -> a
     2:4:com.android.tools.r8.ir.optimize.SimpleDominatingEffectAnalysis$SimpleEffectAnalysisResult build():239:241 -> a
     1:1:void fail():219:219 -> b
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.k00:
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.F00:
     com.android.tools.r8.ir.code.BasicBlock alwaysHitTarget -> f
     boolean $assertionsDisabled -> j
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
@@ -70714,7 +70841,7 @@
     99:100:boolean optimize():105 -> f
     101:101:void com.android.tools.r8.ir.optimize.SwitchCaseEliminator.replaceSwitchByGoto():153:153 -> f
     101:101:boolean optimize():105 -> f
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.l00:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.G00:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -70736,14 +70863,14 @@
     75:75:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122 -> a
     76:76:boolean lambda$extractSwitchMap$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Instruction):122:122 -> a
     77:79:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):165:167 -> a
-    80:80:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    80:80:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     80:80:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167 -> a
     81:81:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167:167 -> a
-    82:82:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    82:82:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     82:82:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167 -> a
     83:83:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):167:167 -> a
     1:1:void lambda$processClasses$0(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedField):98:98 -> b
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.X30:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.t40:
     1:14: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):42:55 -> a
     1:14: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):85 -> a
     1:14:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$4(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):77 -> a
@@ -70890,9 +71017,9 @@
     87:87: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):178 -> e
     87:87: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):55 -> e
     87:87:com.android.tools.r8.graph.Code lambda$synthesizeToStringIfNotNullMethod$1(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):47 -> e
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.V30:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$MethodSynthesizerConsumer -> com.android.tools.r8.internal.r40:
     com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.W30:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.s40:
     com.android.tools.r8.graph.ProgramMethod method -> a
     boolean optimized -> b
     boolean $assertionsDisabled -> c
@@ -70902,7 +71029,7 @@
     1:2:com.android.tools.r8.graph.ProgramMethod getMethod():185:186 -> a
     3:4:void optimize(com.android.tools.r8.ir.conversion.MethodProcessor):194:195 -> a
     1:1:com.android.tools.r8.graph.ProgramMethod uncheckedGetMethod():190:190 -> b
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.ya:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.Ba:
     java.util.concurrent.ConcurrentHashMap knownClasses -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():40:40 -> <clinit>
@@ -70936,7 +71063,7 @@
     133:150:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):284:301 -> a
     133:150:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):269 -> a
     133:150:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
-    151:151:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    151:151:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     151:151:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):304 -> a
     151:151:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):269 -> a
     151:151:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
@@ -70960,12 +71087,12 @@
     160:160: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
     161:162:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):270:271 -> a
     161:162: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.xa:
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.Aa:
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NOT_ELIGIBLE -> c
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus 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.za:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.Ca:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.inliner.InliningIRProvider inliningIRProvider -> b
     boolean $assertionsDisabled -> e
@@ -70980,11 +71107,11 @@
     15:24:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):71:80 -> a
     25:54:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):111:140 -> a
     25:54:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     55:55:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     55:55:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    56:56:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    56:56:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     56:56:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):140 -> a
     56:56:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     57:57:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
@@ -70997,18 +71124,18 @@
     61:68:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     69:70:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):129:130 -> a
     69:70:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     71:71:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):130 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     71:71:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     72:72:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):130 -> a
     72:72:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     73:73:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):82:82 -> a
     74:76:boolean com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.exceedsInstructionBudgetAfterIncrement(int):98:100 -> a
     74:76:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):83 -> a
     77:77:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):92:92 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.Ca:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.Fa:
     java.util.Map deferredAliasValidityChecks -> c
     java.util.Set receiverAliases -> a
     java.util.Set illegalReceiverAliases -> b
@@ -71032,7 +71159,7 @@
     1:1:boolean com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet.isDefiniteReceiverAlias(com.android.tools.r8.ir.code.Value):78:78 -> d
     1:1:boolean isReceiverAlias(com.android.tools.r8.ir.code.Value):74 -> d
     1:1:java.util.List lambda$addDeferredAliasValidityCheck$0(com.android.tools.r8.ir.code.Value):68:68 -> e
-com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.Tk:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.Yk:
     com.android.tools.r8.ir.code.Instruction root -> c
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.ir.code.Value defaultValue -> e
@@ -71053,11 +71180,11 @@
     44:56:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):108 -> a
     57:71:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):108:122 -> a
     72:103:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):128:159 -> a
-    104:104:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):38:38 -> a
+    104:104:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):37:37 -> a
     104:104:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):160 -> a
     105:108: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
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.pq:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.uq:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.ProgramMethod method -> f
     com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet receivers -> o
@@ -71107,10 +71234,10 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     116:116: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):890:890 -> a
     116:116:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):331 -> a
-    117:117:boolean com.android.tools.r8.utils.AndroidApiLevelUtils.isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions):22:22 -> a
+    117:117:boolean com.android.tools.r8.utils.AndroidApiLevelUtils.isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions):23:23 -> a
     117:117: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):890 -> a
     117:117:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):331 -> a
-    118:118:boolean com.android.tools.r8.utils.AndroidApiLevelUtils.isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions):21:21 -> a
+    118:118:boolean com.android.tools.r8.utils.AndroidApiLevelUtils.isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions):22:22 -> a
     118:118: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):890 -> a
     118:118:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):331 -> a
     119:125: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):894:900 -> a
@@ -71122,10 +71249,10 @@
     127:143:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):331 -> a
     144:152: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):912:920 -> a
     144:152:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):331 -> a
-    153:153:boolean com.android.tools.r8.utils.AndroidApiLevelUtils.isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions):22:22 -> a
+    153:153:boolean com.android.tools.r8.utils.AndroidApiLevelUtils.isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions):23:23 -> a
     153:153: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):920 -> a
     153:153:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):331 -> a
-    154:154:boolean com.android.tools.r8.utils.AndroidApiLevelUtils.isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions):21:21 -> a
+    154:154:boolean com.android.tools.r8.utils.AndroidApiLevelUtils.isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions):22:22 -> a
     154:154: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):920 -> a
     154:154:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(com.android.tools.r8.utils.LazyBox):331 -> a
     155:160: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):925:930 -> a
@@ -71257,7 +71384,7 @@
     425:440:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):770 -> a
     425:440:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):678 -> a
     425:440:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):391 -> a
-    441:441:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    441:441:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):41:41 -> a
     441:441:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceFieldReadFromStaticGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set):815 -> a
     441:441:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReadsFromStaticGet(com.android.tools.r8.ir.code.IRCode,java.util.Set,com.android.tools.r8.ir.optimize.AssumeRemover):770 -> a
     441:441:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.removeFieldReads(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.AssumeRemover):678 -> a
@@ -71333,9 +71460,9 @@
     543:543:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
     543:543:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):473 -> a
     544:556:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):473:485 -> a
-    557:557:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    557:557:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     557:557:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):485 -> a
-    558:558:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    558:558:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     558:558:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):485 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     559:566:boolean forceInlineIndirectMethodInvocations(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):486:493 -> a
@@ -71400,10 +71527,10 @@
     1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():130:130 -> b
     2:2:boolean lambda$forceInlineIndirectMethodInvocations$0(com.android.tools.r8.graph.ProgramMethod):511:511 -> b
     3:3:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):820:820 -> b
-    4:4:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> b
+    4:4:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> b
     4:4:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):821 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> b
+    5:5:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> b
     5:5:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):821 -> b
     6:6:java.lang.RuntimeException reportUnknownFieldReadFromSingleton(com.android.tools.r8.ir.code.InstanceGet):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":834,"2":835,"3":836}}
@@ -71435,35 +71562,35 @@
     2:3:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):45:46 -> g
     2:3:void rebindIndirectEligibleInstanceUsersFromPhis():535 -> g
     4:27:void rebindIndirectEligibleInstanceUsersFromPhis():536:559 -> 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):223:223 -> 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):224:224 -> g
     28:28:void rebindIndirectEligibleInstanceUsersFromPhis():559 -> g
-    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> g
+    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> g
     29:29:void rebindIndirectEligibleInstanceUsersFromPhis():559 -> g
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     30:48:void rebindIndirectEligibleInstanceUsersFromPhis():561:579 -> g
     49:49:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> g
     49:49:void rebindIndirectEligibleInstanceUsersFromPhis():579 -> g
     50:55:void rebindIndirectEligibleInstanceUsersFromPhis():579:584 -> g
-    56:56:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> g
+    56:56:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> g
     56:56:void rebindIndirectEligibleInstanceUsersFromPhis():584 -> g
-    57:57:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> g
+    57:57:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> g
     57:57:void rebindIndirectEligibleInstanceUsersFromPhis():584 -> g
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     58:59:void rebindIndirectEligibleInstanceUsersFromPhis():584:585 -> g
-    60:60:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> g
+    60:60:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> g
     60:60:void rebindIndirectEligibleInstanceUsersFromPhis():585 -> g
-    61:61:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> g
+    61:61:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> g
     61:61:void rebindIndirectEligibleInstanceUsersFromPhis():585 -> g
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     62:62:void rebindIndirectEligibleInstanceUsersFromPhis():585:585 -> g
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.oq:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.tq:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():1258:1258 -> <clinit>
     1:2:void <init>():1260:1261 -> <init>
 com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext -> com.android.tools.r8.internal.O1:
     1:1:void <init>():14:14 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext getDefaultContext():17:17 -> a
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage -> com.android.tools.r8.internal.V5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage -> com.android.tools.r8.internal.X5:
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage BOTTOM -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -71488,7 +71615,7 @@
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():75 -> j
     2:2:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():75:75 -> j
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsage getInstance():18:18 -> l
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext -> com.android.tools.r8.internal.W5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext -> com.android.tools.r8.internal.Y5:
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -71497,7 +71624,7 @@
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext):27 -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize() -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsagePerContext getInstance():17:17 -> c
-com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages -> com.android.tools.r8.internal.X5:
+com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages -> com.android.tools.r8.internal.Z5:
     com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages INSTANCE -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -71511,7 +71638,7 @@
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize() -> f
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages getInstance():17:17 -> h
     1:1:int hashCode():55:55 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.Ba:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ClassInlinerMethodConstraintAnalysis -> com.android.tools.r8.internal.Ea:
     1:7:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):21:27 -> a
     8:8:com.android.tools.r8.ir.optimize.classinliner.analysis.BottomParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.bottom():64:64 -> a
     8:8:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):29 -> a
@@ -71525,12 +71652,12 @@
     25:25:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):23:23 -> a
     26:26:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult lambda$analyze$0(com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):33:33 -> a
     27:27:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages lambda$analyze$1(com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult):37:37 -> a
-com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.nf:
+com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext -> com.android.tools.r8.internal.rf:
     com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext INSTANCE -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.DefaultAnalysisContext getInstance():14:14 -> b
-com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage -> com.android.tools.r8.internal.Cv:
+com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage -> com.android.tools.r8.internal.Iv:
     java.util.Set methodCallsWithParameterAsReceiver -> c
     boolean isParameterReturned -> e
     boolean isParameterUsedAsLock -> f
@@ -71568,7 +71695,7 @@
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned():25 -> i
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage.setParameterUsedAsLock():184:187 -> j
     1:4:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock():25 -> j
-com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder -> com.android.tools.r8.internal.Bv:
+com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder -> com.android.tools.r8.internal.Hv:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder methodCallsWithParameterAsReceiverBuilder -> c
     boolean isParameterReturned -> e
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder fieldsReadFromParameterBuilder -> b
@@ -71607,7 +71734,7 @@
     4:4:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder joinIsReceiverUsedAsLock(boolean):300:300 -> c
     5:5:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder setParameterReturned():310:310 -> c
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.InternalNonEmptyParameterUsage$Builder setParameterUsedAsLock():315:315 -> d
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.tJ:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage -> com.android.tools.r8.internal.AJ:
     boolean isParameterReturned -> e
     boolean isParameterUsedAsLock -> f
     java.util.Set castsWithParameter -> a
@@ -71635,7 +71762,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.Multiset getMethodCallsWithParameterAsReceiver():86:86 -> n
     1:1:boolean isParameterMutated():91:91 -> o
     1:1:boolean isParameterUsedAsLock():101:101 -> p
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.uJ:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext -> com.android.tools.r8.internal.BJ:
     java.util.Map backing -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():14:14 -> <clinit>
@@ -71716,7 +71843,7 @@
     1:1:int getNumberOfContexts():99:99 -> d
     1:6:boolean equals(java.lang.Object):133:138 -> equals
     1:1:int hashCode():143:143 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.vJ:
+com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages -> com.android.tools.r8.internal.CJ:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap backing -> b
     com.android.tools.r8.ir.code.AssumeAndCheckCastAliasedValueConfiguration aliasedValueConfiguration -> c
     boolean $assertionsDisabled -> d
@@ -71778,16 +71905,16 @@
     51:51:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$abandonClassInliningInCurrentContexts$3(int[],int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):150 -> a
     52:52:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext lambda$abandonClassInliningInCurrentContexts$3(int[],int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext):151:151 -> a
     53:55:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.lang.Iterable,java.util.function.Predicate):157:159 -> a
-    56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    56:56:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     56:56:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.lang.Iterable,java.util.function.Predicate):159 -> a
-    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    57:57:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     57:57:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.lang.Iterable,java.util.function.Predicate):159 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     58:62:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages abandonClassInliningInCurrentContexts(java.lang.Iterable,java.util.function.Predicate):160:164 -> a
     63:63:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameter(com.android.tools.r8.ir.code.Value,java.util.function.BiFunction):169:169 -> a
-    64:64:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    64:64:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     64:64:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameter(com.android.tools.r8.ir.code.Value,java.util.function.BiFunction):169 -> a
-    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    65:65:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     65:65:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameter(com.android.tools.r8.ir.code.Value,java.util.function.BiFunction):169 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     66:68:com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages rebuildParameter(com.android.tools.r8.ir.code.Value,java.util.function.BiFunction):170:172 -> a
@@ -71811,7 +71938,7 @@
     10:10:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages.top():68:68 -> f
     10:10:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize():113 -> f
     1:1:int hashCode():237:237 -> hashCode
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.IN:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage -> com.android.tools.r8.internal.ZN:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addCastWithParameter(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage addFieldReadFromParameter(com.android.tools.r8.graph.DexField) -> a
@@ -71827,13 +71954,13 @@
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned() -> i
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock() -> j
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage top():91:91 -> k
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.JN:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext -> com.android.tools.r8.internal.aO:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsagePerContext asKnown() -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext rebuild(java.util.function.BiFunction) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize() -> b
-com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.android.tools.r8.internal.KN:
+com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages -> com.android.tools.r8.internal.bO:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext get(int) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages put(int,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext) -> a
@@ -71858,7 +71985,7 @@
     com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages asNonEmpty() -> e
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages externalize() -> f
     boolean isTop() -> g
-com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.x10:
+com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction -> com.android.tools.r8.internal.T10:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Set instructionsOfInterest -> g
     com.android.tools.r8.graph.AppView appView -> a
@@ -71919,11 +72046,11 @@
     79:80:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.analyzeIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):184:185 -> a
     79:80:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):119 -> a
     79:80:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):108 -> a
-    81:81:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    81:81:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     81:81:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.analyzeIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):185 -> a
     81:81:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):119 -> a
     81:81:com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages):108 -> a
-    82:82:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    82:82:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     82:82:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.analyzeIf(com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):185 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     82:82:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages com.android.tools.r8.ir.optimize.classinliner.analysis.TransferFunction.apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):119 -> a
@@ -71949,24 +72076,24 @@
     108:113:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstanceGet(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):201:206 -> a
     114:114:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInstanceGet$2(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):203:203 -> a
     115:115:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):214:214 -> a
-    116:116:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    116:116:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     116:116:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):214 -> a
-    117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     117:117:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):214 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     118:122:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):215:219 -> a
-    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    123:123:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     123:123:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):219 -> a
-    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    124:124:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     124:124:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):219 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     125:133:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInstancePut(com.android.tools.r8.ir.code.InstancePut,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):220:228 -> a
     134:134:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInstancePut$3(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):226:226 -> a
     135:135:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):237:237 -> a
     136:139:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):236:239 -> a
-    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    140:140:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     140:140:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):239 -> a
-    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    141:141:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     141:141:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):239 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     142:147:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):240:245 -> a
@@ -71980,18 +72107,18 @@
     173:173:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):247:247 -> a
     174:174:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):282:282 -> a
     175:178:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):281:284 -> a
-    179:179:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    179:179:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     179:179:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):284 -> a
-    180:180:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    180:180:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     180:180:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):284 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     181:194:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeInterface(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):285:298 -> a
     195:195:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage lambda$analyzeInvokeInterface$4(com.android.tools.r8.ir.code.InvokeInterface,com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):299:299 -> a
     196:196:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):324:324 -> a
     197:200:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):323:326 -> a
-    201:201:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    201:201:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     201:201:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):326 -> a
-    202:202:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    202:202:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     202:202:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):326 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     203:216:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):327:340 -> a
@@ -72003,9 +72130,9 @@
     222:222:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages fail(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):362:362 -> a
     223:223:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages fail(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsages):361:361 -> a
     224:224:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):366:366 -> a
-    225:225:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    225:225:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     225:225:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):366 -> a
-    226:226:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    226:226:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     226:226:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):366 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     227:228:boolean isArgumentOfInterest(com.android.tools.r8.ir.code.Value):366:367 -> a
@@ -72042,7 +72169,7 @@
     1:1:boolean lambda$widen$8(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):418:418 -> d
     2:2:boolean com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage.isTop():0:0 -> d
     2:2:boolean lambda$widen$8(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext,com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage):418 -> d
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.y30:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage -> com.android.tools.r8.internal.U30:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage TOP -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -72055,7 +72182,7 @@
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterReturned() -> i
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage setParameterUsedAsLock() -> j
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsage getInstance():18:18 -> l
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.z30:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext -> com.android.tools.r8.internal.V30:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -72064,7 +72191,7 @@
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage get(com.android.tools.r8.ir.optimize.classinliner.analysis.AnalysisContext):27 -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsagePerContext externalize() -> b
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsagePerContext getInstance():17:17 -> c
-com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages -> com.android.tools.r8.internal.A30:
+com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages -> com.android.tools.r8.internal.W30:
     com.android.tools.r8.ir.optimize.classinliner.analysis.UnknownParameterUsages INSTANCE -> b
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -72093,14 +72220,14 @@
     boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int):34:34 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint getInstance():23:23 -> c
-com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.Aa:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint -> com.android.tools.r8.internal.Da:
     com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsage getParameterUsage(int) -> a
     boolean isEligibleForNewInstanceClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,int) -> a
     boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod) -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysFalseClassInlinerMethodConstraint alwaysFalse():36:36 -> a
     1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.AlwaysTrueClassInlinerMethodConstraint alwaysTrue():40:40 -> b
-com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.Gd:
+com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint -> com.android.tools.r8.internal.Jd:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.optimize.classinliner.analysis.ParameterUsages usages -> a
     1:1:void <clinit>():29:29 -> <clinit>
@@ -72124,14 +72251,14 @@
     67:72:boolean com.android.tools.r8.ir.optimize.classinliner.constraint.ConditionalClassInlinerMethodConstraint.hasUnsafeCast(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.classinliner.analysis.NonEmptyParameterUsage):145:150 -> a
     67:72:boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod):120 -> a
     73:84:boolean isEligibleForStaticGetClassInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,int,com.android.tools.r8.ir.analysis.value.objectstate.ObjectState,com.android.tools.r8.graph.ProgramMethod):123:134 -> a
-com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.j00:
+com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.E00:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():19:19 -> <init>
     1:14:boolean switchCaseIsAlwaysHit(com.android.tools.r8.ir.code.Switch,int):26:39 -> a
     15:31:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue,int):44:60 -> a
     32:43:boolean switchFallthroughIsNeverHit(com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.analysis.value.AbstractValue):64:75 -> a
-com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer -> com.android.tools.r8.internal.wi:
+com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer -> com.android.tools.r8.internal.Ai:
     com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer INSTANCE -> a
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>():28:28 -> <init>
@@ -72139,7 +72266,7 @@
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
     void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens) -> a
     void recordEnumState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValues) -> a
-    1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():20:20 -> a
+    1:1:com.android.tools.r8.ir.optimize.enums.EnumDataMap com.android.tools.r8.ir.optimize.enums.EnumDataMap.empty():25:25 -> a
     1:1:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):79 -> a
     2:2:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):79:79 -> a
     3:3:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):64:64 -> a
@@ -72148,98 +72275,98 @@
     void unsetRewriter() -> c
     void updateEnumUnboxingCandidatesInfo() -> d
     1:1:com.android.tools.r8.ir.optimize.enums.EmptyEnumUnboxer get():31:31 -> e
-com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.aj:
+com.android.tools.r8.ir.optimize.enums.EnumDataMap -> com.android.tools.r8.internal.fj:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> a
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():16:16 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):23:24 -> <init>
-    1:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData get(com.android.tools.r8.graph.DexProgramClass):40:41 -> a
-    3:4:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData getInstanceFieldData(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):51:52 -> a
-    5:6:int getUnboxedValue(com.android.tools.r8.graph.DexField):61:62 -> a
-    7:7:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getUnboxedValue(com.android.tools.r8.graph.DexField):114:114 -> a
-    7:7:int getUnboxedValue(com.android.tools.r8.graph.DexField):62 -> a
-    8:8:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getUnboxedValue(com.android.tools.r8.graph.DexField):114:114 -> a
-    8:8:int getUnboxedValue(com.android.tools.r8.graph.DexField):62 -> a
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):28:29 -> <init>
+    1:2:com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData get(com.android.tools.r8.graph.DexProgramClass):62:63 -> a
+    3:4:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData getInstanceFieldData(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):73:74 -> a
+    5:6:int getUnboxedValue(com.android.tools.r8.graph.DexField):83:84 -> a
+    7:7:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getUnboxedValue(com.android.tools.r8.graph.DexField):136:136 -> a
+    7:7:int getUnboxedValue(com.android.tools.r8.graph.DexField):84 -> a
+    8:8:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getUnboxedValue(com.android.tools.r8.graph.DexField):136:136 -> a
+    8:8:int getUnboxedValue(com.android.tools.r8.graph.DexField):84 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getUnboxedValue(com.android.tools.r8.graph.DexField):114:114 -> a
-    9:9:int getUnboxedValue(com.android.tools.r8.graph.DexField):62 -> a
-    10:10:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getUnboxedValue(com.android.tools.r8.graph.DexField):115:115 -> a
-    10:10:int getUnboxedValue(com.android.tools.r8.graph.DexField):62 -> a
+    9:9:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getUnboxedValue(com.android.tools.r8.graph.DexField):136:136 -> a
+    9:9:int getUnboxedValue(com.android.tools.r8.graph.DexField):84 -> a
+    10:10:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getUnboxedValue(com.android.tools.r8.graph.DexField):137:137 -> a
+    10:10:int getUnboxedValue(com.android.tools.r8.graph.DexField):84 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    11:11:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getUnboxedValue(com.android.tools.r8.graph.DexField):115:115 -> a
-    11:11:int getUnboxedValue(com.android.tools.r8.graph.DexField):62 -> a
-    12:13:int getValuesSize(com.android.tools.r8.graph.DexType):66:67 -> a
-    14:14:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():139:139 -> a
-    14:14:int getValuesSize(com.android.tools.r8.graph.DexType):67 -> a
-    15:15:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasValues():135:135 -> a
-    15:15:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():139 -> a
-    15:15:int getValuesSize(com.android.tools.r8.graph.DexType):67 -> a
+    11:11:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getUnboxedValue(com.android.tools.r8.graph.DexField):137:137 -> a
+    11:11:int getUnboxedValue(com.android.tools.r8.graph.DexField):84 -> a
+    12:13:int getValuesSize(com.android.tools.r8.graph.DexType):88:89 -> a
+    14:14:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():161:161 -> a
+    14:14:int getValuesSize(com.android.tools.r8.graph.DexType):89 -> a
+    15:15:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasValues():157:157 -> a
+    15:15:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():161 -> a
+    15:15:int getValuesSize(com.android.tools.r8.graph.DexType):89 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    16:16:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():139:139 -> a
-    16:16:int getValuesSize(com.android.tools.r8.graph.DexType):67 -> a
-    17:17:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():140:140 -> a
-    17:17:int getValuesSize(com.android.tools.r8.graph.DexType):67 -> a
+    16:16:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():161:161 -> a
+    16:16:int getValuesSize(com.android.tools.r8.graph.DexType):89 -> a
+    17:17:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():162:162 -> a
+    17:17:int getValuesSize(com.android.tools.r8.graph.DexType):89 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:18:int getMaxValuesSize():72:72 -> a
-    19:19:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasValues():135:135 -> a
-    19:19:int getMaxValuesSize():73 -> a
+    18:18:int getMaxValuesSize():94:94 -> a
+    19:19:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasValues():157:157 -> a
+    19:19:int getMaxValuesSize():95 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    20:20:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():139:139 -> a
-    20:20:int getMaxValuesSize():74 -> a
-    21:21:int getMaxValuesSize():74:74 -> a
-    1:1:boolean isUnboxedEnum(com.android.tools.r8.graph.DexType):32:32 -> b
-    2:2:java.util.Set getUnboxedEnums():46:46 -> b
-    3:4:boolean hasUnboxedValueFor(com.android.tools.r8.graph.DexField):56:57 -> b
-    5:5:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):123:123 -> b
-    5:5:boolean hasUnboxedValueFor(com.android.tools.r8.graph.DexField):57 -> b
+    20:20:int com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.getValuesSize():161:161 -> a
+    20:20:int getMaxValuesSize():96 -> a
+    21:21:int getMaxValuesSize():96:96 -> a
+    1:1:boolean isUnboxedEnum(com.android.tools.r8.graph.DexType):54:54 -> b
+    2:2:java.util.Set getUnboxedEnums():68:68 -> b
+    3:4:boolean hasUnboxedValueFor(com.android.tools.r8.graph.DexField):78:79 -> b
+    5:5:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):145:145 -> b
+    5:5:boolean hasUnboxedValueFor(com.android.tools.r8.graph.DexField):79 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):123:123 -> b
-    6:6:boolean hasUnboxedValueFor(com.android.tools.r8.graph.DexField):57 -> b
-    1:1:boolean isEmpty():36:36 -> c
-    2:3:boolean matchesValuesField(com.android.tools.r8.graph.DexField):81:82 -> c
-    4:4:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> c
-    4:4:boolean matchesValuesField(com.android.tools.r8.graph.DexField):82 -> c
+    6:6:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):145:145 -> b
+    6:6:boolean hasUnboxedValueFor(com.android.tools.r8.graph.DexField):79 -> b
+    1:1:boolean isEmpty():58:58 -> c
+    2:3:boolean matchesValuesField(com.android.tools.r8.graph.DexField):103:104 -> c
+    4:4:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):153:153 -> c
+    4:4:boolean matchesValuesField(com.android.tools.r8.graph.DexField):104 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> c
-    5:5:boolean matchesValuesField(com.android.tools.r8.graph.DexField):82 -> c
-com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.Zi:
+    5:5:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):153:153 -> c
+    5:5:boolean matchesValuesField(com.android.tools.r8.graph.DexField):104 -> c
+com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData -> com.android.tools.r8.internal.ej:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.com.google.common.collect.ImmutableMap unboxedValues -> b
     int valuesSize -> d
     com.android.tools.r8.com.google.common.collect.ImmutableMap instanceFieldMap -> a
     com.android.tools.r8.com.google.common.collect.ImmutableSet valuesFields -> c
-    1:1:void <clinit>():85:85 -> <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):101:105 -> <init>
-    1:2:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData getInstanceFieldData(com.android.tools.r8.graph.DexField):109:110 -> a
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.fj:
+    1:1:void <clinit>():107:107 -> <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):123:127 -> <init>
+    1:2:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData getInstanceFieldData(com.android.tools.r8.graph.DexField):131:132 -> a
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.kj:
     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.bj:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.gj:
     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.cj:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.hj:
     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.dj:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.ij:
     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.ej:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.jj:
     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.ij:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.nj:
     1:1:void <init>():24:24 -> <init>
     void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor) -> a
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -72255,7 +72382,7 @@
     void rewriteWithLens() -> b
     void unsetRewriter() -> c
     void updateEnumUnboxingCandidatesInfo() -> d
-com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl -> com.android.tools.r8.internal.kj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl -> com.android.tools.r8.internal.pj:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumUnboxingCandidatesInfo -> c
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter enumUnboxerRewriter -> i
@@ -72293,10 +72420,10 @@
     95:95:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):266:266 -> a
     96:109:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):460:473 -> a
     96:109:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):266 -> a
-    110:110:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    110:110:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
     110:110:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):473 -> a
     110:110:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):266 -> a
-    111:111:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    111:111:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
     111:111:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):473 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     111:111:void analyzeEnums(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):266 -> a
@@ -72494,7 +72621,7 @@
     485:491:void com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result,com.android.tools.r8.graph.GraphLens):720:726 -> a
     485:491:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):700 -> a
     492:495:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):702:705 -> a
-    496:496:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    496:496:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     496:496:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):711 -> a
     497:497:void unboxEnums(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):711:711 -> a
     498:498:java.util.Set lambda$unboxEnums$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.LongLivedClassSetBuilder):668:668 -> a
@@ -72718,7 +72845,7 @@
     1:15:com.android.tools.r8.ir.optimize.enums.EnumDataMap analyzeEnumInstances():779:793 -> e
     1:1:void analyzeInitializers():982:982 -> f
     1:1:com.android.tools.r8.graph.DexClassAndField getOrdinalField():181:181 -> g
-com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl$1 -> com.android.tools.r8.internal.jj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl$1 -> com.android.tools.r8.internal.oj:
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens val$graphLens -> a
     com.android.tools.r8.ir.optimize.enums.EnumUnboxerImpl this$0 -> d
     com.android.tools.r8.graph.GraphLens val$codeLens -> b
@@ -72729,11 +72856,11 @@
     3:3:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):733 -> a
     4:5:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):733:734 -> a
     6:7:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):740:741 -> a
-    8:8:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):164:164 -> a
+    8:8:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):165:165 -> a
     8:8:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):741 -> a
     9:12:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):741:744 -> a
     13:21:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):743:751 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.nj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.sj:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumToUnboxCandidates -> d
@@ -72759,11 +72886,11 @@
     22:22:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):48:48 -> a
     23:23:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():83:83 -> a
     23:23:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
-    24:24:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    24:24:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     24:24:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():84 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:24:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
-    25:25:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    25:25:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     25:25:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():84 -> a
     25:25:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates(com.android.tools.r8.graph.GraphLens):51 -> a
     26:26:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():85:85 -> a
@@ -72787,7 +72914,7 @@
     57:59:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):126:128 -> a
     57:59:void lambda$removePinnedCandidates$1(com.android.tools.r8.graph.DexMethod):119 -> a
     60:62:void removePinnedCandidate(com.android.tools.r8.graph.DexType):133:135 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.pj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.uj:
     java.util.Map enumTypeToInfo -> a
     java.util.Set prunedMethods -> b
     boolean $assertionsDisabled -> c
@@ -72809,7 +72936,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet candidates():62:62 -> c
     1:1:void clear():128:128 -> d
     1:1:boolean isEmpty():58:58 -> e
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.oj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.tj:
     java.util.Set requiredInstanceFieldData -> c
     com.android.tools.r8.graph.DexProgramClass enumClass -> a
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodDependencies -> b
@@ -72823,7 +72950,7 @@
     4:4:void addRequiredInstanceFieldData(com.android.tools.r8.graph.DexField):158:158 -> a
     1:1:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):131:131 -> b
     2:2:java.util.Set getRequiredInstanceFieldData():162:162 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.tj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods -> com.android.tools.r8.internal.yj:
     1:1:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
     2:17:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):93:108 -> a
     18:18:void com.android.tools.r8.cf.code.CfNew.<init>(com.android.tools.r8.graph.DexType):38:38 -> a
@@ -72848,7 +72975,7 @@
     98:98:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):192:192 -> a
     98:98:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):174 -> a
     98:98:com.android.tools.r8.graph.CfCode EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):140 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.vj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.Aj:
     java.util.Map prototypeChangesPerMethod -> o
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> n
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnums -> p
@@ -72866,7 +72993,7 @@
     38:38:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder enumUnboxingLensBuilder(com.android.tools.r8.graph.AppView):120:120 -> a
     boolean hasCustomCodeRewritings() -> f
     boolean isEnumUnboxerLens() -> h
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.uj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.zj:
     java.util.Map typeMap -> b
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap newMethodSignatures -> d
@@ -72896,7 +73023,7 @@
     66:69:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):212:215 -> a
     70:70:void recordCheckNotZeroMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):214:214 -> a
     71:77:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens build(com.android.tools.r8.graph.AppView):219:225 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.wj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Bj:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap unboxedEnumsData -> e
     java.util.Map checkNotNullToCheckNotZeroMapping -> b
     com.android.tools.r8.graph.DexItemFactory factory -> c
@@ -73107,10 +73234,10 @@
     360:364:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):287:291 -> a
     365:365:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.removeRedundantValuesArrayCloning(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,java.util.Set):500:500 -> a
     365:365:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):297 -> a
-    366:366:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    366:366:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
     366:366:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.removeRedundantValuesArrayCloning(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,java.util.Set):500 -> a
     366:366:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):297 -> a
-    367:367:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    367:367:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
     367:367:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.removeRedundantValuesArrayCloning(com.android.tools.r8.ir.code.InvokeStatic,java.util.Set,java.util.Set):500 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     367:367:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.graph.proto.RewrittenPrototypeDescription):297 -> a
@@ -73170,7 +73297,7 @@
     487:487:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):600 -> a
     487:487:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):593 -> a
     488:488:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):591:591 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.yj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.Dj:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap enumDataMap -> e
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -73217,9 +73344,9 @@
     188:188:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     188:188:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):271 -> a
     189:195:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):275:281 -> a
-    196:196:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    196:196:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
     196:196:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):281 -> a
-    197:197:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    197:197:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
     197:197:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):281 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     198:208:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):281:291 -> a
@@ -73271,18 +73398,18 @@
     642:647:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):396:401 -> a
     648:649:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):559:560 -> a
     648:649:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    650:650:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119:119 -> a
+    650:650:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):141:141 -> a
     650:650:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
     650:650:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    651:651:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):123:123 -> a
-    651:651:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119 -> a
+    651:651:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):145:145 -> a
+    651:651:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):141 -> a
     651:651:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
     651:651:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    652:652:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127:127 -> a
+    652:652:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):149:149 -> a
     652:652:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
     652:652:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):402 -> a
-    653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> a
-    653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127 -> a
+    653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):153:153 -> a
+    653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):149 -> a
     653:653:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
     653:653:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):402 -> a
     654:654:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561:561 -> a
@@ -73291,14 +73418,14 @@
     662:662:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1067:1067 -> a
     662:662:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):410 -> a
     663:668:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):411:416 -> a
-    669:669:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    669:669:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     669:669:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):416 -> a
-    670:670:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():23:23 -> a
+    670:670:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():22:22 -> a
     670:670:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):417 -> a
     671:677:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):419:425 -> a
     678:678:void fixupEnumClassInitializer(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):424:424 -> a
     682:687:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):432:437 -> a
-    688:688:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> a
+    688:688:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> a
     688:688:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):437 -> a
     689:689:java.util.Collection createLocalUtilityFields(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):452:452 -> a
     690:690:boolean lambda$createLocalUtilityFields$8(java.util.Map,com.android.tools.r8.graph.DexField):448:448 -> a
@@ -73337,18 +73464,18 @@
     777:781:void lambda$createLocalUtilityMethod$15(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodAccessFlags):547:551 -> a
     782:783:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):559:560 -> a
     782:783:void lambda$createLocalUtilityFields$9(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):439 -> a
-    784:784:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119:119 -> a
+    784:784:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):141:141 -> a
     784:784:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
     784:784:void lambda$createLocalUtilityFields$9(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):439 -> a
-    785:785:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):123:123 -> a
-    785:785:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):119 -> a
+    785:785:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.DexField):145:145 -> a
+    785:785:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.hasUnboxedValueFor(com.android.tools.r8.graph.ProgramField):141 -> a
     785:785:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
     785:785:void lambda$createLocalUtilityFields$9(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):439 -> a
-    786:786:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127:127 -> a
+    786:786:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):149:149 -> a
     786:786:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
     786:786:void lambda$createLocalUtilityFields$9(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):439 -> a
-    787:787:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):131:131 -> a
-    787:787:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):127 -> a
+    787:787:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.DexField):153:153 -> a
+    787:787:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData.matchesValuesField(com.android.tools.r8.graph.ProgramField):149 -> a
     787:787:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):560 -> a
     787:787:void lambda$createLocalUtilityFields$9(com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.PrunedItems$Builder,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,java.util.Map,com.android.tools.r8.graph.ProgramField):439 -> a
     788:788:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.isPrunedAfterEnumUnboxing(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData):561:561 -> a
@@ -73389,16 +73516,16 @@
     7:7:void lambda$fixupEnumClassInitializers$7(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):232:232 -> b
     8:30:java.util.Collection createLocalUtilityMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass,com.android.tools.r8.graph.PrunedItems$Builder):490:512 -> b
     1:9:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):101:109 -> c
-    10:10:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):28:28 -> c
+    10:10:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):50:50 -> c
     10:10:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):109 -> c
     11:12:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):111:112 -> c
     13:13:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses.getLocalUtilityClass(com.android.tools.r8.graph.DexProgramClass):46:46 -> c
     13:13:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):112 -> c
     14:26:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):114:126 -> c
-    27:27:void com.android.tools.r8.graph.DexClass.setStaticFields(java.util.Collection):434:434 -> c
+    27:27:void com.android.tools.r8.graph.DexClass.setStaticFields(java.util.Collection):439:439 -> c
     27:27:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):126 -> c
     28:45:com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result fixupTypeReferences(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):128:145 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result -> com.android.tools.r8.internal.xj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer$Result -> com.android.tools.r8.internal.Cj:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens lens -> b
     com.android.tools.r8.com.google.common.collect.BiMap checkNotNullToCheckNotZeroMapping -> a
     com.android.tools.r8.graph.PrunedItems prunedItems -> c
@@ -73406,13 +73533,13 @@
     1:1:com.android.tools.r8.com.google.common.collect.BiMap getCheckNotNullToCheckNotZeroMapping():686:686 -> a
     1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens getLens():690:690 -> b
     1:1:com.android.tools.r8.graph.PrunedItems getPrunedItems():694:694 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClass -> com.android.tools.r8.internal.zj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClass -> com.android.tools.r8.internal.Ej:
     com.android.tools.r8.graph.DexProgramClass synthesizingContext -> a
     1:2:void <init>(com.android.tools.r8.graph.DexProgramClass):15:16 -> <init>
     void ensureMethods(com.android.tools.r8.graph.AppView) -> a
     com.android.tools.r8.graph.DexProgramClass getDefinition() -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizingContext():24:24 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses -> com.android.tools.r8.internal.Bj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses -> com.android.tools.r8.internal.Gj:
     com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass sharedUtilityClass -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap localUtilityClasses -> a
     boolean $assertionsDisabled -> c
@@ -73425,7 +73552,7 @@
     3:3:void forEach(java.util.function.Consumer):42:42 -> a
     4:5:com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass getLocalUtilityClass(com.android.tools.r8.graph.DexType):50:51 -> a
     6:6:com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass getSharedUtilityClass():56:56 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder -> com.android.tools.r8.internal.Aj:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingUtilityClasses$Builder -> com.android.tools.r8.internal.Fj:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder fieldAccessInfoCollectionModifierBuilder -> d
     com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass sharedUtilityClass -> c
@@ -73453,7 +73580,7 @@
     38:40:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):132:134 -> a
     41:41:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):133:133 -> a
     42:42:com.android.tools.r8.graph.DexType getUtilityClassType(com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.graph.DexItemFactory):132:132 -> a
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.Dj:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.Ij:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -73504,7 +73631,7 @@
     69:69:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):217 -> a
     70: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):320:321 -> a
     70:71:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):217 -> a
-    72:72:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1719:1719 -> a
+    72:72:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1695:1695 -> 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):217 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
@@ -73581,7 +73708,7 @@
     82:82: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):355:355 -> b
     82:82:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):124 -> b
     83:83:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):126:126 -> b
-    84:84:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> b
+    84:84:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
     84:84:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):126 -> b
     85:85:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):132:132 -> b
     86:86: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):346:346 -> b
@@ -73606,23 +73733,23 @@
     102:102: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):348:348 -> b
     102:102:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):132 -> b
     103:105:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):138:140 -> b
-    106:106:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> b
+    106:106:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
     106:106:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):140 -> b
     107:113:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):141:147 -> b
-    114:114:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> b
+    114:114:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> b
     114:114:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):148 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    115:115:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> b
+    115:115:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> b
     115:115:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):148 -> b
     116:127:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):153:164 -> b
     128:137:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):163:172 -> b
-    138:138:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> b
+    138:138:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
     138:138:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):172 -> b
     139:143:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):173:177 -> b
     144:144:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> b
     144:144:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):177 -> b
     145:147:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):177:179 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.Cj:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.Hj:
     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
@@ -73630,7 +73757,7 @@
     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):374:374 -> <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):387:392 -> <init>
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.android.tools.r8.internal.iE:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass -> com.android.tools.r8.internal.pE:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData data -> c
     com.android.tools.r8.graph.DexProgramClass localUtilityClass -> b
     boolean $assertionsDisabled -> d
@@ -73677,7 +73804,7 @@
     1:5:com.android.tools.r8.graph.ProgramMethod ensureValueOfMethod(com.android.tools.r8.graph.AppView):100:104 -> c
     6:6:com.android.tools.r8.graph.ProgramMethod ensureValueOfMethod(com.android.tools.r8.graph.AppView):101:101 -> c
     7:7:com.android.tools.r8.graph.DexType getType():144:144 -> c
-com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.hE:
+com.android.tools.r8.ir.optimize.enums.LocalEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.oE:
     com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData data -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexProgramClass enumToUnbox -> c
@@ -73690,7 +73817,7 @@
     3:3:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind lambda$createClass$0(com.android.tools.r8.synthesis.SyntheticNaming):176:176 -> a
     4:4:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):179:179 -> a
     1:9:com.android.tools.r8.graph.DexProgramClass createClass():172:180 -> b
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass -> com.android.tools.r8.internal.PW:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass -> com.android.tools.r8.internal.kX:
     com.android.tools.r8.graph.DexProgramClass sharedUtilityClass -> b
     com.android.tools.r8.graph.ProgramMethod valuesMethod -> c
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):55:57 -> <init>
@@ -73834,7 +73961,7 @@
     69:69:com.android.tools.r8.graph.Code lambda$ensureOrdinalMethod$4(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):124 -> e
     1:5:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):119:123 -> f
     6:6:com.android.tools.r8.graph.ProgramMethod ensureOrdinalMethod(com.android.tools.r8.graph.AppView):120:120 -> f
-com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.OW:
+com.android.tools.r8.ir.optimize.enums.SharedEnumUnboxingUtilityClass$Builder -> com.android.tools.r8.internal.jX:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder fieldAccessInfoCollectionModifierBuilder -> d
@@ -73887,7 +74014,7 @@
     75:80:void lambda$createClass$1(com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):211:216 -> a
     81:84:com.android.tools.r8.graph.DexProgramClass findDeterministicContextType(java.util.Set):325:328 -> a
     1:19:com.android.tools.r8.graph.DexProgramClass createClass():200:218 -> b
-com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification -> com.android.tools.r8.internal.R9:
+com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification -> com.android.tools.r8.internal.U9:
     int argumentIndex -> a
     1:2:void <init>(int):16:17 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification asCheckNotNullClassification() -> a
@@ -73900,12 +74027,12 @@
     6:6:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):48 -> a
     7:9:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection):51:53 -> a
     1:1:int getArgumentIndex():21:21 -> c
-com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification -> com.android.tools.r8.internal.lj:
+com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification -> com.android.tools.r8.internal.qj:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.CheckNotNullEnumUnboxerMethodClassification asCheckNotNullClassification() -> a
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     1:1:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification unknown():12:12 -> b
-com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis -> com.android.tools.r8.internal.mj:
+com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis -> com.android.tools.r8.internal.rj:
     1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):38:38 -> a
     2:2:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():12:12 -> a
     2:2:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):40 -> a
@@ -73915,7 +74042,7 @@
     22:26:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):61:65 -> a
     27:28:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis.onlyHasCheckNotNullUsers(com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.conversion.MethodProcessor):81:82 -> a
     27:28:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):70 -> a
-    29:29:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    29:29:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
     29:29:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis.onlyHasCheckNotNullUsers(com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.conversion.MethodProcessor):85 -> a
     29:29:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):70 -> a
     30:41:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassificationAnalysis.onlyHasCheckNotNullUsers(com.android.tools.r8.ir.code.Argument,com.android.tools.r8.ir.conversion.MethodProcessor):87:98 -> a
@@ -73927,13 +74054,13 @@
     70:70:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):75 -> a
     71:71:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.unknown():12:12 -> a
     71:71:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification analyze(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):45 -> a
-com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification -> com.android.tools.r8.internal.r30:
+com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification -> com.android.tools.r8.internal.N30:
     com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     1:1:com.android.tools.r8.ir.optimize.enums.classification.UnknownEnumUnboxerMethodClassification getInstance():17:17 -> c
-com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tools.r8.internal.S9:
+com.android.tools.r8.ir.optimize.enums.code.CheckNotZeroCode -> com.android.tools.r8.internal.V9:
     com.android.tools.r8.graph.ProgramMethod checkNotNullMethod -> d
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):40:41 -> <init>
     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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):51:52 -> a
@@ -73949,7 +74076,7 @@
     14:14: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):1660:1660 -> a
     14:14: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):67 -> a
     15:17: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):67:69 -> a
-    18:18:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    18:18:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     18:18: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):65 -> a
     19:21: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):72:74 -> a
     22:22:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
@@ -73959,7 +74086,7 @@
     26:26: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):77 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     27:27: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):78:78 -> a
-    28:28:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    28:28:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     28:28: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):78 -> a
     29:30: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,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):83:84 -> a
     31:31:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.IRCode.getEntryPosition():182:182 -> a
@@ -73979,7 +74106,7 @@
     130:130:java.lang.String toString():127:127 -> toString
     131:131:java.lang.String toString():127:127 -> toString
     128:128:java.lang.String toString():127:127 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.pS:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason -> com.android.tools.r8.internal.KS:
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_ON_ARRAY -> h
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INVOKE_CLASSPATH -> g
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_FIELD_PUT -> j
@@ -73996,7 +74123,7 @@
     com.android.tools.r8.ir.optimize.enums.eligibility.Reason INVALID_INIT -> e
     1:28:void <clinit>():12:39 -> <clinit>
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$IllegalInvokeWithImpreciseParameterTypeReason -> com.android.tools.r8.internal.mS:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$IllegalInvokeWithImpreciseParameterTypeReason -> com.android.tools.r8.internal.HS:
     com.android.tools.r8.graph.DexMethod invokedMethod -> o
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):70:71 -> <init>
     1:1:java.lang.String toString():0:0 -> toString
@@ -74005,11 +74132,11 @@
     84:84:java.lang.String toString():81:81 -> toString
     85:85:java.lang.String toString():81:81 -> toString
     82:82:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.nS:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$StringReason -> com.android.tools.r8.internal.IS:
     java.lang.String message -> o
     1:2:void <init>(java.lang.String):51:52 -> <init>
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.oS:
+com.android.tools.r8.ir.optimize.enums.eligibility.Reason$UnsupportedLibraryInvokeReason -> com.android.tools.r8.internal.JS:
     com.android.tools.r8.graph.DexMethod invokedMethod -> o
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):207:208 -> <init>
     1:1:java.lang.String toString():0:0 -> toString
@@ -74018,13 +74145,13 @@
     221:221:java.lang.String toString():218:218 -> toString
     222:222:java.lang.String toString():218:218 -> toString
     219:219:java.lang.String toString():218:218 -> toString
-com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.internal.M6:
+com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo -> com.android.tools.r8.internal.O6:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo asConcreteCallSiteOptimizationInfo() -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractArgumentValue(int):32:32 -> a
     1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo top():14:14 -> b
     2:2:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType(int):27:27 -> b
-com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.id:
+com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.ld:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap constants -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap dynamicTypes -> b
     int size -> a
@@ -74082,7 +74209,7 @@
     1:5:boolean equals(java.lang.Object):192:196 -> equals
     1:1:int hashCode():201:201 -> hashCode
     1:2:java.lang.String toString():206:207 -> toString
-com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.qf:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.uf:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -74095,7 +74222,7 @@
     boolean isDead() -> i
     boolean valueHasBeenPropagated() -> j
     1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():18:18 -> k
-com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.xf:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.Bf:
     com.android.tools.r8.ir.analysis.value.AbstractValue UNKNOWN_ABSTRACT_RETURN_VALUE -> e
     java.util.Set UNKNOWN_INITIALIZED_CLASSES_ON_NORMAL_EXIT -> c
     com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo DEFAULT_INSTANCE -> b
@@ -74104,14 +74231,15 @@
     boolean $assertionsDisabled -> g
     1:12:void <clinit>():26:37 -> <clinit>
     1:1:void <init>():42:42 -> <init>
-    boolean neverReturnsNormally() -> A
-    boolean returnValueHasBeenPropagated() -> B
-    boolean returnValueOnlyDependsOnArguments() -> C
-    boolean returnsArgument() -> D
-    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo toMutableOptimizationInfo():191:191 -> E
+    1:1:boolean mayHaveSideEffects():176:176 -> A
+    boolean neverReturnsNormally() -> B
+    boolean returnValueHasBeenPropagated() -> C
+    boolean returnValueOnlyDependsOnArguments() -> D
+    boolean returnsArgument() -> E
+    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo toMutableOptimizationInfo():196:196 -> F
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):90:90 -> a
-    2:2:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):176:176 -> a
-    3:3:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo.toMutableOptimizationInfo():191:191 -> a
+    2:2:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):181:181 -> a
+    3:3:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo.toMutableOptimizationInfo():196:196 -> a
     3:3:com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo():26 -> a
     boolean cannotBeKept() -> e
     boolean classInitializerMayBePostponed() -> f
@@ -74131,11 +74259,11 @@
     1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():141:141 -> s
     java.util.BitSet getUnusedArguments() -> t
     boolean hasBeenInlinedIntoSingleCallSite() -> u
-    boolean isInitializerEnablingJavaVmAssertions() -> w
-    boolean isMultiCallerMethod() -> x
-    1:1:com.android.tools.r8.utils.OptionalBool isReturnValueUsed():161:161 -> y
-    1:1:boolean mayHaveSideEffects():171:171 -> z
-com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.Fk:
+    boolean isConvertCheckNotNull() -> w
+    boolean isInitializerEnablingJavaVmAssertions() -> x
+    boolean isMultiCallerMethod() -> y
+    1:1:com.android.tools.r8.utils.OptionalBool isReturnValueUsed():166:166 -> z
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.Kk:
     1:1:void <init>():10:10 -> <init>
     boolean cannotBeKept() -> e
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue() -> f
@@ -74143,24 +74271,25 @@
     int getReadBits() -> h
     boolean isDead() -> i
     boolean valueHasBeenPropagated() -> j
-com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.mD:
+com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.sD:
     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:com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback getInstance():18:18 -> c
-com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo -> com.android.tools.r8.internal.HF:
+com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo -> com.android.tools.r8.internal.OF:
     com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo() -> a
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> b
     com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo asMutableMethodOptimizationInfo() -> c
     boolean isMutableOptimizationInfo() -> d
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.wG:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.DG:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():22:22 -> <init>
-    boolean neverReturnsNormally() -> A
-    boolean returnValueHasBeenPropagated() -> B
-    boolean returnValueOnlyDependsOnArguments() -> C
-    boolean returnsArgument() -> D
+    boolean mayHaveSideEffects() -> A
+    boolean neverReturnsNormally() -> B
+    boolean returnValueHasBeenPropagated() -> C
+    boolean returnValueOnlyDependsOnArguments() -> D
+    boolean returnsArgument() -> E
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect) -> a
     boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions) -> a
     boolean cannotBeKept() -> e
@@ -74180,12 +74309,12 @@
     com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint() -> s
     java.util.BitSet getUnusedArguments() -> t
     boolean hasBeenInlinedIntoSingleCallSite() -> u
-    1:2:boolean hasUnusedArguments():80:81 -> v
-    boolean isInitializerEnablingJavaVmAssertions() -> w
-    boolean isMultiCallerMethod() -> x
-    com.android.tools.r8.utils.OptionalBool isReturnValueUsed() -> y
-    boolean mayHaveSideEffects() -> z
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.yG:
+    1:2:boolean hasUnusedArguments():82:83 -> v
+    boolean isConvertCheckNotNull() -> w
+    boolean isInitializerEnablingJavaVmAssertions() -> x
+    boolean isMultiCallerMethod() -> y
+    com.android.tools.r8.utils.OptionalBool isReturnValueUsed() -> z
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.FG:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization checkCastAndInstanceOfMethodSpecialization -> b
@@ -74383,12 +74512,12 @@
     403: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):256 -> a
     403: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):229 -> a
     403: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    408:408:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    408:408:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     408:408: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):408 -> a
     408:408: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):256 -> a
     408:408: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):229 -> a
     408:408: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    409:409:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    409:409:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     409:409: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):408 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     409:409: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):256 -> a
@@ -74406,168 +74535,177 @@
     451:458: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):256 -> a
     451:458: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):229 -> a
     451:458: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    459:459:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    459:459:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     459:459: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):367 -> a
     459:459: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):256 -> a
     459:459: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):229 -> a
     459:459: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    460:460:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    460:460:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     460:460: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):367 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     460:460: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):256 -> a
     460:460: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):229 -> a
     460:460: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    461:465: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):368:372 -> a
-    461:465: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):256 -> a
-    461:465: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):229 -> a
-    461:465: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    466:466:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
-    466:466: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):372 -> a
-    466:466: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):256 -> a
-    466:466: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):229 -> a
-    466:466: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    467:467:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    461:461: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):368:368 -> a
+    461:461: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):256 -> a
+    461:461: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):229 -> a
+    461:461: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    462:462:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
+    462:462: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):368 -> a
+    462:462: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):256 -> a
+    462:462: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):229 -> a
+    462:462: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    463:466: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):369:372 -> a
+    463:466: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):256 -> a
+    463:466: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):229 -> a
+    463:466: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    467:467:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     467:467: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):372 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     467:467: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):256 -> a
     467:467: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):229 -> a
     467:467: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    468:472: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):375:379 -> a
-    468:472: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):256 -> a
-    468:472: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):229 -> a
-    468:472: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    473: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):341:349 -> a
-    473: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):256 -> a
-    473: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):229 -> a
-    473: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    482:482:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    482:482: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):350 -> a
-    482:482: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):256 -> a
-    482:482: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):229 -> a
-    482:482: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    483:483: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):352:352 -> a
+    468:468:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
+    468:468: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):372 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    468:468: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):256 -> a
+    468:468: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):229 -> a
+    468:468: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    469:473: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):375:379 -> a
+    469:473: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):256 -> a
+    469:473: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):229 -> a
+    469:473: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    474:482: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):341:349 -> a
+    474:482: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):256 -> a
+    474:482: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):229 -> a
+    474:482: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    483:483:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    483:483: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):350 -> a
     483:483: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):256 -> a
     483:483: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):229 -> a
     483:483: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    484:661: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):305:482 -> a
-    484:661: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):256 -> a
-    484:661: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):229 -> a
-    484:661: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    662:841: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):333:512 -> a
-    662:841: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):256 -> a
-    662:841: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):229 -> a
-    662:841: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    842:842: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):258:258 -> a
-    842:842: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):229 -> a
-    842:842:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    843:843: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):257:257 -> a
+    484: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):352:352 -> a
+    484: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):256 -> a
+    484: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):229 -> a
+    484: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    485:662: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):305:482 -> a
+    485:662: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):256 -> a
+    485:662: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):229 -> a
+    485:662: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    663:842: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):333:512 -> a
+    663:842: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):256 -> a
+    663:842: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):229 -> a
+    663:842:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    843:843: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):258:258 -> a
     843:843: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):229 -> a
     843:843:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    844:844: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):230:230 -> a
+    844:844: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):257:257 -> a
+    844:844: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):229 -> a
     844:844: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
-    845:847: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):885:887 -> a
-    845:847: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):154 -> a
-    848:848: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):977:977 -> a
-    848:848: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
-    849:855: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):984:990 -> a
-    849:855: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):978 -> a
-    849:855:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
-    856:856: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):979:979 -> a
-    856:856: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
-    857:857: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):996:996 -> a
-    857:857: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):156 -> a
-    858:880: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):1005:1027 -> a
-    858:880: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):997 -> a
-    858: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):156 -> a
-    881:881: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):998:998 -> a
-    881:881:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):156 -> a
-    882:882: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):1035:1035 -> a
-    882:882: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    883:902: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):1042:1061 -> a
-    883:902: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):1036 -> a
-    883:902: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    903:903: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):1037:1037 -> a
-    903:903: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
-    904:904:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.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):1176:1176 -> a
-    904:904: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):158 -> a
-    905:914:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1183:1192 -> a
-    905:914:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.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):1177 -> a
-    905:914:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):158 -> a
-    915:915:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.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):1178:1178 -> a
-    915:915:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):158 -> a
-    916:916:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):517:517 -> a
-    917:917:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
-    917:917:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):521 -> a
-    918:918:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):604:604 -> a
-    919:977:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):535:593 -> a
-    919:977:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):604 -> a
-    978:991:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):581:594 -> a
-    978:991:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):604 -> a
-    992:995:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):607:610 -> a
-    996:998:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):717:719 -> a
-    996:998:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):610 -> a
-    999:999:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):611:611 -> a
-    1000:1000:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
-    1000:1000:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):613 -> a
-    1001:1002:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):614:615 -> a
-    1003:1010: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):682:689 -> a
-    1003:1010:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):615 -> a
-    1011:1011:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    1011:1011: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):689 -> a
+    845:845: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):230:230 -> a
+    845:845:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):152 -> a
+    846:848: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):885:887 -> a
+    846:848: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):154 -> a
+    849:849: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):977:977 -> a
+    849:849:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
+    850:856: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):984:990 -> a
+    850:856: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):978 -> a
+    850:856: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
+    857:857: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):979:979 -> a
+    857:857: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):155 -> a
+    858:858: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):996:996 -> a
+    858:858:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):156 -> a
+    859:881: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):1005:1027 -> a
+    859:881: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):997 -> a
+    859:881:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):156 -> a
+    882:882: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):998:998 -> a
+    882:882: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):156 -> a
+    883:883: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):1035:1035 -> a
+    883:883: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    884:903: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):1042:1061 -> a
+    884:903: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):1036 -> a
+    884:903: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    904:904: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):1037:1037 -> a
+    904:904: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):157 -> a
+    905:905:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.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):1176:1176 -> a
+    905:905: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):158 -> a
+    906:915:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1183:1192 -> a
+    906:915:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.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):1177 -> a
+    906:915:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):158 -> a
+    916:916:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeUnusedArguments(com.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):1178:1178 -> a
+    916:916: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.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):158 -> a
+    917:917:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):517:517 -> a
+    918:918:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
+    918:918:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):521 -> a
+    919:919:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):604:604 -> a
+    920:978:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):535:593 -> a
+    920:978:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):604 -> a
+    979:992:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):581:594 -> a
+    979:992:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):604 -> a
+    993:996:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):607:610 -> a
+    997:999:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):717:719 -> a
+    997:999:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):610 -> a
+    1000:1000:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):611:611 -> a
+    1001:1001:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
+    1001:1001:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):613 -> a
+    1002:1003:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):614:615 -> a
+    1004:1011: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):682:689 -> a
+    1004:1011:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):615 -> a
+    1012:1012:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    1012:1012: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):689 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1011:1011:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):615 -> a
-    1012:1014: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):690:692 -> a
-    1012:1014:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):615 -> a
-    1015:1015:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():294:294 -> a
-    1015:1015: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):694 -> a
-    1015:1015:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):615 -> a
-    1016:1016: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):695:695 -> a
+    1012:1012:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):615 -> a
+    1013:1015: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):690:692 -> a
+    1013:1015:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):615 -> a
+    1016:1016:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():294:294 -> a
+    1016:1016: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):694 -> a
     1016:1016:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):615 -> a
-    1017:1019:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):616:618 -> a
-    1020:1027:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):703:710 -> a
-    1020:1027:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):618 -> a
-    1028:1028:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    1028:1028:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):710 -> a
+    1017:1017: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):695:695 -> a
+    1017:1017:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):615 -> a
+    1018:1020:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):616:618 -> a
+    1021:1028:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):703:710 -> a
+    1021:1028:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):618 -> a
+    1029:1029:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    1029:1029:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):710 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1028:1028:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):618 -> a
-    1029:1031:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):711:713 -> a
-    1029:1031:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):618 -> a
-    1032:1033:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):621:622 -> a
-    1034:1036:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):717:719 -> a
-    1034:1036:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):622 -> a
-    1037:1045:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):623:631 -> a
-    1046:1053: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):728:735 -> a
-    1046:1053:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):631 -> a
-    1054:1065:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):632:643 -> a
-    1066:1066:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    1066:1066:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):646 -> a
-    1067:1073:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):646:652 -> a
-    1074:1097:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):893:916 -> a
-    1098:1098:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):915:915 -> a
-    1099:1099:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():442:442 -> a
-    1099:1099:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):925 -> a
-    1100:1100:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):928:928 -> a
-    1101:1112:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexProgramClass):961:972 -> a
-    1101:1112:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):928 -> a
-    1113:1132:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):936:955 -> a
-    1133:1133:boolean lambda$computeMayHaveSideEffects$1(com.android.tools.r8.graph.DexProgramClass):918:918 -> a
-    1134:1142:boolean 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):1067:1075 -> a
-    1143:1143:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
-    1143:1143:boolean 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):1076 -> a
-    1144:1153:boolean 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):1076:1085 -> a
-    1154:1185:boolean 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):1080:1111 -> a
-    1186:1231: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):1125:1170 -> a
-    1186:1231:boolean 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):1112 -> a
-    1232:1232:boolean lambda$isNonNullOnNormalExit$3(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1083:1083 -> a
+    1029:1029:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):618 -> a
+    1030:1032:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):711:713 -> a
+    1030:1032:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):618 -> a
+    1033:1034:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):621:622 -> a
+    1035:1037:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):717:719 -> a
+    1035:1037:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):622 -> a
+    1038:1046:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):623:631 -> a
+    1047:1054: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):728:735 -> a
+    1047:1054:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):631 -> a
+    1055:1066:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):632:643 -> a
+    1067:1067:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    1067:1067:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):646 -> a
+    1068:1074:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$0(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):646:652 -> a
+    1075:1098:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):893:916 -> a
+    1099:1099:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):915:915 -> a
+    1100:1100:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():442:442 -> a
+    1100:1100:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):925 -> a
+    1101:1101:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):928:928 -> a
+    1102:1113:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexProgramClass):961:972 -> a
+    1102:1113:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):928 -> a
+    1114:1133:void computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):936:955 -> a
+    1134:1134:boolean lambda$computeMayHaveSideEffects$1(com.android.tools.r8.graph.DexProgramClass):918:918 -> a
+    1135:1143:boolean 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):1067:1075 -> a
+    1144:1144:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
+    1144:1144:boolean 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):1076 -> a
+    1145:1154:boolean 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):1076:1085 -> a
+    1155:1186:boolean 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):1080:1111 -> a
+    1187:1232: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):1125:1170 -> a
+    1187:1232:boolean 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):1112 -> a
+    1233:1233:boolean lambda$isNonNullOnNormalExit$3(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):1083:1083 -> a
     boolean lambda$computeMayHaveSideEffects$2(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.xG:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.EG:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect NO_EFFECT -> e
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect OTHER_EFFECT -> d
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect CONDITIONAL_EFFECT -> c
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect DESIRED_EFFECT -> b
     1:4:void <clinit>():671:674 -> <clinit>
     1:1:void <init>(java.lang.String,int):670:670 -> <init>
-com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.fI:
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.mI:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> d
     int flags -> b
@@ -74595,182 +74733,185 @@
     1:1:void markAsPropagated():114:114 -> l
     1:1:void markCannotBeKept():87:87 -> m
     1:5:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():49:53 -> n
-com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo -> com.android.tools.r8.internal.gI:
-    com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification enumUnboxerMethodClassification -> g
-    java.util.BitSet nonNullParamOrThrow -> m
-    java.util.BitSet nonNullParamOnNormalExits -> n
+com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo -> com.android.tools.r8.internal.nI:
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference inlining -> j
+    com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification enumUnboxerMethodClassification -> h
+    com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint simpleInliningConstraint -> p
+    java.util.BitSet nonNullParamOnNormalExits -> o
+    java.util.BitSet nonNullParamOrThrow -> n
     com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo argumentInfos -> b
     int returnedArgument -> d
-    com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint simpleInliningConstraint -> o
-    java.util.BitSet unusedArguments -> p
+    java.util.BitSet unusedArguments -> q
     com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint classInlinerConstraint -> f
-    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference inlining -> i
-    boolean $assertionsDisabled -> s
-    com.android.tools.r8.utils.OptionalBool isReturnValueUsed -> j
-    com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo bridgeInfo -> k
+    com.android.tools.r8.utils.OptionalBool isReturnValueUsed -> k
+    com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo bridgeInfo -> l
+    boolean $assertionsDisabled -> t
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractReturnValue -> e
     java.util.Set initializedClassesOnNormalExit -> c
-    com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection instanceInitializerInfoCollection -> l
-    int DEFAULT_FLAGS -> r
-    com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> h
-    int flags -> q
-    1:70:void <clinit>():36:105 -> <clinit>
-    71:71:boolean com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo.mayHaveSideEffects():171:171 -> <clinit>
-    71:71:void <clinit>():108 -> <clinit>
-    72:84:void <clinit>():108:120 -> <clinit>
-    1:1:void <init>():125:125 -> <init>
-    2:86:void <init>():39:123 -> <init>
-    87:87:void <init>(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):131:131 -> <init>
-    88:194:void <init>(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):39:145 -> <init>
-    1:1:boolean neverReturnsNormally():384:384 -> A
-    1:1:boolean returnValueHasBeenPropagated():653:653 -> B
-    1:1:boolean returnValueOnlyDependsOnArguments():498:498 -> C
-    1:1:boolean returnsArgument():373:373 -> D
-    1:1:void markAsPropagated():648:648 -> E
-    1:1:void markCannotBeKept():216:216 -> F
-    1:1:void markClassInitializerMayBePostponed():225:225 -> G
-    1:2:void markForceInline():630:631 -> H
-    1:1:void markInlinedIntoSingleCallSite():364:364 -> I
-    1:1:void markMayNotHaveSideEffects():559:559 -> J
-    1:1:void markNeverReturnsNormally():575:575 -> K
-    1:1:void markReturnValueOnlyDependsOnArguments():567:567 -> L
-    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo mutableCopy():672:672 -> M
-    1:1:void setInitializerEnablingJavaAssertions():527:527 -> N
-    1:473:void setIsReturnValueUsed(com.android.tools.r8.utils.OptionalBool):0:472 -> O
-    1:4:void setMultiCallerMethod():639:642 -> P
-    1:1:void unsetAbstractReturnValue():589:589 -> Q
-    1:1:void unsetBridgeInfo():405:405 -> R
-    1:1:void unsetClassInitializerMayBePostponed():229:229 -> S
-    1:1:void unsetClassInlinerMethodConstraint():266:266 -> T
-    1:1:void unsetDynamicType():624:624 -> U
-    1:1:void unsetEnumUnboxerMethodClassification():284:284 -> V
-    1:1:void unsetForceInline():635:635 -> W
-    1:1:void unsetInitializedClassesOnNormalExit():539:539 -> X
-    1:1:void unsetInitializerEnablingJavaVmAssertions():531:531 -> Y
-    1:1:void unsetInlinedIntoSingleCallSite():368:368 -> Z
+    com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection instanceInitializerInfoCollection -> m
+    boolean convertCheckNotNull -> g
+    int flags -> r
+    int DEFAULT_FLAGS -> s
+    com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> i
+    1:71:void <clinit>():36:106 -> <clinit>
+    72:72:boolean com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo.mayHaveSideEffects():176:176 -> <clinit>
+    72:72:void <clinit>():109 -> <clinit>
+    73:85:void <clinit>():109:121 -> <clinit>
+    1:1:void <init>():126:126 -> <init>
+    2:87:void <init>():39:124 -> <init>
+    88:88:void <init>(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):132:132 -> <init>
+    89:196:void <init>(com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):39:146 -> <init>
+    1:1:boolean mayHaveSideEffects():492:492 -> A
+    1:1:boolean neverReturnsNormally():389:389 -> B
+    1:1:boolean returnValueHasBeenPropagated():663:663 -> C
+    1:1:boolean returnValueOnlyDependsOnArguments():508:508 -> D
+    1:1:boolean returnsArgument():378:378 -> E
+    1:1:void markAsPropagated():658:658 -> F
+    1:1:void markCannotBeKept():217:217 -> G
+    1:1:void markClassInitializerMayBePostponed():226:226 -> H
+    1:2:void markForceInline():640:641 -> I
+    1:1:void markInlinedIntoSingleCallSite():369:369 -> J
+    1:1:void markMayNotHaveSideEffects():569:569 -> K
+    1:1:void markNeverReturnsNormally():585:585 -> L
+    1:1:void markReturnValueOnlyDependsOnArguments():577:577 -> M
+    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo mutableCopy():682:682 -> N
+    1:1:void setConvertCheckNotNull():271:271 -> O
+    1:1:void setInitializerEnablingJavaAssertions():537:537 -> P
+    1:483:void setIsReturnValueUsed(com.android.tools.r8.utils.OptionalBool):0:482 -> Q
+    1:4:void setMultiCallerMethod():649:652 -> R
+    1:1:void unsetAbstractReturnValue():599:599 -> S
+    1:1:void unsetBridgeInfo():410:410 -> T
+    1:1:void unsetClassInitializerMayBePostponed():230:230 -> U
+    1:1:void unsetClassInlinerMethodConstraint():267:267 -> V
+    1:1:void unsetDynamicType():634:634 -> W
+    1:1:void unsetEnumUnboxerMethodClassification():289:289 -> X
+    1:1:void unsetForceInline():645:645 -> Y
+    1:1:void unsetInitializedClassesOnNormalExit():549:549 -> Z
     com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo toMutableOptimizationInfo() -> a
-    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):169:169 -> a
-    2:2:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupAbstractReturnValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):175:175 -> a
-    3:4:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupInstanceInitializerInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):184:185 -> a
-    5:5:void clearFlag(int):202:202 -> a
-    6:6:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):238:238 -> a
-    6:6:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):150 -> a
+    1:1:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupClassTypeReferences(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,java.util.Set):170:170 -> a
+    2:2:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupAbstractReturnValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens):176:176 -> a
+    3:4:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupInstanceInitializerInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.PrunedItems):185:186 -> a
+    5:5:void clearFlag(int):203:203 -> a
+    6:6:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):239:239 -> a
+    6:6:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):151 -> a
     7:7:boolean com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo.isConcreteCallSiteOptimizationInfo():0:0 -> a
-    7:7:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):238 -> a
-    7:7:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):150 -> a
-    8:9:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):239:240 -> a
-    8:9:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):150 -> a
-    10:12:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupBridgeInfo(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):393:395 -> a
-    10:12:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):151 -> a
-    13:14:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupClassInlinerMethodConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):256:257 -> a
-    13:14:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):152 -> a
-    15:16:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):289:290 -> a
-    15:16:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):153 -> a
-    17:18:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupInstanceInitializerInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):316:317 -> a
-    17:18:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):154 -> a
-    19:19:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):346:346 -> a
-    19:19:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):155 -> a
-    20:20:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):327:327 -> a
-    20:20:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):156 -> a
-    21:21:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupReturnedArgumentIndex(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):554:554 -> a
-    21:21:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):157 -> a
-    22:24:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupSimpleInliningConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):511:513 -> a
-    22:24:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):158 -> a
-    25:25:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupSimpleInliningConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):512:512 -> a
-    25:25:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):158 -> a
-    26:26:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupUnusedArguments(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):433:433 -> a
-    26:26:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):159 -> a
-    27:27:void setArgumentInfos(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):246:246 -> a
-    28:28:void setClassInlinerMethodConstraint(com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):262:262 -> a
-    29:29:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):277:277 -> a
+    7:7:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):239 -> a
+    7:7:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):151 -> a
+    8:9:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupArgumentInfos(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):240:241 -> a
+    8:9:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):151 -> a
+    10:12:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupBridgeInfo(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):398:400 -> a
+    10:12:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):152 -> a
+    13:14:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupClassInlinerMethodConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):257:258 -> a
+    13:14:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):153 -> a
+    15:16:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):294:295 -> a
+    15:16:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):154 -> a
+    17:18:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupInstanceInitializerInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):321:322 -> a
+    17:18:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):155 -> a
+    19:19:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):351:351 -> a
+    19:19:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):156 -> a
+    20:20:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):332:332 -> a
+    20:20:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):157 -> a
+    21:21:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupReturnedArgumentIndex(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):564:564 -> a
+    21:21:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):158 -> a
+    22:24:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupSimpleInliningConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):521:523 -> a
+    22:24:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):159 -> a
+    25:25:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupSimpleInliningConstraint(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):522:522 -> a
+    25:25:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):159 -> a
+    26:26:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.fixupUnusedArguments(com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):438:438 -> a
+    26:26:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixup(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoFixer):160 -> a
+    27:27:void setArgumentInfos(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):247:247 -> a
+    28:28:void setClassInlinerMethodConstraint(com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint):263:263 -> a
+    29:29:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):282:282 -> a
     30:30:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
-    30:30:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):277 -> a
-    31:31:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):278:278 -> a
+    30:30:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):282 -> a
+    31:31:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):283:283 -> a
     32:32:boolean com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification.isCheckNotNullClassification():0:0 -> a
-    32:32:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):278 -> a
-    33:35:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):277:279 -> a
-    36:36:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):311:311 -> a
-    37:37:void setBridgeInfo(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):401:401 -> a
-    38:38:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupUnusedArguments(java.util.BitSet):439:439 -> a
-    39:39:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.mayHaveSideEffects():482:482 -> a
-    39:39:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):487 -> a
-    40:40:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):418:418 -> a
-    40:40:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):490 -> a
-    41:41:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getSimpleInliningConstraint():424:424 -> a
-    41:41:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):419 -> a
-    41:41:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):490 -> a
-    42:42:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):490:490 -> a
-    43:43:void setSimpleInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):502:502 -> a
-    44:44:void setInstanceInitializerInfoCollection(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):519:519 -> a
-    45:45:void markInitializesClassesOnNormalExit(java.util.Set):535:535 -> a
-    46:46:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):583:583 -> a
+    32:32:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):283 -> a
+    33:35:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo setEnumUnboxerMethodClassification(com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):282:284 -> a
+    36:36:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getInstanceInitializerInfo(com.android.tools.r8.ir.code.InvokeDirect):316:316 -> a
+    37:37:void setBridgeInfo(com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):406:406 -> a
+    38:38:com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo fixupUnusedArguments(java.util.BitSet):444:444 -> a
+    39:39:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.mayHaveSideEffects():492:492 -> a
+    39:39:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):497 -> a
+    40:40:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):423:423 -> a
+    40:40:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):500 -> a
+    41:41:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getSimpleInliningConstraint():429:429 -> a
+    41:41:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getNopInliningConstraint(com.android.tools.r8.utils.InternalOptions):424 -> a
+    41:41:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):500 -> a
+    42:42:boolean mayHaveSideEffects(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.utils.InternalOptions):500:500 -> a
+    43:43:void setSimpleInliningConstraint(com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):512:512 -> a
+    44:44:void setInstanceInitializerInfoCollection(com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):529:529 -> a
+    45:45:void markInitializesClassesOnNormalExit(java.util.Set):545:545 -> a
+    46:46:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):593:593 -> a
     47:47:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":633,"2":634,"3":635}}
-    633:633:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):583:583 -> a
-    634:634:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):583:583 -> a
-    635:635:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):583:583 -> a
-    630:632:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):583:585 -> a
-    636:636:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):593:593 -> a
-    637:643:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):607:613 -> a
-    637:643:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):601 -> a
-    644:644:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):602:602 -> a
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection.empty():23:23 -> a0
-    1:1:void unsetInstanceInitializerInfoCollection():523 -> a0
-    2:2:void unsetInstanceInitializerInfoCollection():523:523 -> a0
-    1:1:boolean isFlagSet(int):206:206 -> b
-    2:2:void setNonNullParamOnNormalExits(java.util.BitSet):351:351 -> b
-    1:1:void unsetMayNotHaveSideEffects():563:563 -> b0
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":643,"2":644,"3":645}}
+    643:643:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):593:593 -> a
+    644:644:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):593:593 -> a
+    645:645:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):593:593 -> a
+    640:642:void markReturnsAbstractValue(com.android.tools.r8.ir.analysis.value.AbstractValue):593:595 -> a
+    646:646:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):603:603 -> a
+    647:653:boolean com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.verifyDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):617:623 -> a
+    647:653:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):611 -> a
+    654:654:void setDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexEncodedMethod):612:612 -> a
+    1:1:void unsetInitializerEnablingJavaVmAssertions():541:541 -> a0
+    1:1:boolean isFlagSet(int):207:207 -> b
+    2:2:void setNonNullParamOnNormalExits(java.util.BitSet):356:356 -> b
+    1:1:void unsetInlinedIntoSingleCallSite():373:373 -> b0
     com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo asMutableMethodOptimizationInfo() -> c
-    1:1:void setNonNullParamOrThrow(java.util.BitSet):332:332 -> c
-    2:4:void markReturnsArgument(int):543:545 -> c
-    1:1:void unsetNeverReturnsNormally():579:579 -> c0
+    1:1:void setNonNullParamOrThrow(java.util.BitSet):337:337 -> c
+    2:4:void markReturnsArgument(int):553:555 -> c
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection.empty():23:23 -> c0
+    1:1:void unsetInstanceInitializerInfoCollection():533 -> c0
+    2:2:void unsetInstanceInitializerInfoCollection():533:533 -> c0
     boolean isMutableOptimizationInfo() -> d
-    1:1:void setFlag(int):198:198 -> d
-    2:3:void setUnusedArguments(java.util.BitSet):445:446 -> d
-    4:4:java.util.BitSet com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getUnusedArguments():429:429 -> d
-    4:4:void setUnusedArguments(java.util.BitSet):447 -> d
-    5:7:void setUnusedArguments(java.util.BitSet):447:449 -> d
-    1:1:void unsetNonNullParamOnNormalExits():355:355 -> d0
-    1:1:boolean cannotBeKept():211:211 -> e
-    1:1:void unsetNonNullParamOrThrow():336:336 -> e0
-    1:1:boolean classInitializerMayBePostponed():221:221 -> f
-    1:1:void unsetReturnValueOnlyDependsOnArguments():571:571 -> f0
-    1:1:boolean forceInline():477:477 -> g
-    1:1:void unsetReturnedArgument():549:549 -> g0
-    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():410:410 -> h
-    1:1:void unsetSimpleInliningConstraint():506:506 -> h0
-    1:1:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos():234:234 -> i
-    1:1:void unsetUnusedArguments():453:453 -> i0
-    1:1:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo():389:389 -> j
-    1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():251:251 -> k
-    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():306:306 -> l
-    1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():296:296 -> m
-    1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification():271:271 -> n
-    1:1:java.util.Set getInitializedClassesOnNormalExit():301:301 -> o
-    1:1:java.util.BitSet getNonNullParamOnNormalExits():341:341 -> p
-    1:1:java.util.BitSet getNonNullParamOrThrow():323:323 -> q
-    1:2:int getReturnedArgument():378:379 -> r
-    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():424:424 -> s
-    1:1:java.util.BitSet getUnusedArguments():429:429 -> t
-    1:1:boolean hasBeenInlinedIntoSingleCallSite():360:360 -> u
-    1:1:boolean isInitializerEnablingJavaVmAssertions():458:458 -> w
-    1:1:boolean isMultiCallerMethod():463:463 -> x
-    1:1:com.android.tools.r8.utils.OptionalBool isReturnValueUsed():468:468 -> y
-    1:1:boolean mayHaveSideEffects():482:482 -> z
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.LM:
+    1:1:void setFlag(int):199:199 -> d
+    2:3:void setUnusedArguments(java.util.BitSet):450:451 -> d
+    4:4:java.util.BitSet com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo.getUnusedArguments():434:434 -> d
+    4:4:void setUnusedArguments(java.util.BitSet):452 -> d
+    5:7:void setUnusedArguments(java.util.BitSet):452:454 -> d
+    1:1:void unsetMayNotHaveSideEffects():573:573 -> d0
+    1:1:boolean cannotBeKept():212:212 -> e
+    1:1:void unsetNeverReturnsNormally():589:589 -> e0
+    1:1:boolean classInitializerMayBePostponed():222:222 -> f
+    1:1:void unsetNonNullParamOnNormalExits():360:360 -> f0
+    1:1:boolean forceInline():487:487 -> g
+    1:1:void unsetNonNullParamOrThrow():341:341 -> g0
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractReturnValue():415:415 -> h
+    1:1:void unsetReturnValueOnlyDependsOnArguments():581:581 -> h0
+    1:1:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getArgumentInfos():235:235 -> i
+    1:1:void unsetReturnedArgument():559:559 -> i0
+    1:1:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo getBridgeInfo():394:394 -> j
+    1:1:void unsetSimpleInliningConstraint():516:516 -> j0
+    1:1:com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint getClassInlinerMethodConstraint():252:252 -> k
+    1:1:void unsetUnusedArguments():458:458 -> k0
+    1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitiveInstanceInitializerInfo():311:311 -> l
+    1:1:com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType():301:301 -> m
+    1:1:com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification getEnumUnboxerMethodClassification():276:276 -> n
+    1:1:java.util.Set getInitializedClassesOnNormalExit():306:306 -> o
+    1:1:java.util.BitSet getNonNullParamOnNormalExits():346:346 -> p
+    1:1:java.util.BitSet getNonNullParamOrThrow():328:328 -> q
+    1:2:int getReturnedArgument():383:384 -> r
+    1:1:com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint getSimpleInliningConstraint():429:429 -> s
+    1:1:java.util.BitSet getUnusedArguments():434:434 -> t
+    1:1:boolean hasBeenInlinedIntoSingleCallSite():365:365 -> u
+    1:1:boolean isConvertCheckNotNull():463:463 -> w
+    1:1:boolean isInitializerEnablingJavaVmAssertions():468:468 -> x
+    1:1:boolean isMultiCallerMethod():473:473 -> y
+    1:1:com.android.tools.r8.utils.OptionalBool isReturnValueUsed():478:478 -> z
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.cN:
     1:1:void <init>():20:20 -> <init>
     void modifyAppInfoWithLiveness(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple com.android.tools.r8.ir.optimize.info.OptimizationFeedback.getSimple():44:44 -> a
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple getSimpleFeedback():48 -> a
     2:2:void fixupOptimizationInfos(java.lang.Iterable,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):62:62 -> a
     3:3:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):63:63 -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.KM:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.bN:
     void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo) -> a
     void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo) -> a
     1:3:void fixup(com.android.tools.r8.graph.DexEncodedMember):30:32 -> a
     4:4:void lambda$fixup$0(com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo,com.android.tools.r8.graph.DexEncodedField):33:33 -> a
     5:5:void lambda$fixup$1(com.android.tools.r8.ir.optimize.info.MemberOptimizationInfo,com.android.tools.r8.graph.DexEncodedMethod):34:34 -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.MM:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.dN:
     java.util.Map fieldOptimizationInfos -> b
     java.util.Map methodOptimizationInfos -> c
     java.util.Map processed -> d
@@ -74871,104 +75012,105 @@
     void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod) -> f
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.ir.optimize.info.a:
     1:1:void <init>():26:26 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.NM:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.eN:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:1:void <init>():30:30 -> <init>
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:1:void <init>():31:31 -> <init>
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
     void markFieldHasDynamicType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.DynamicType) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
     void setClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.classinliner.constraint.ClassInlinerMethodConstraint) -> a
-    1:1:void markFieldAsDead(com.android.tools.r8.graph.DexEncodedField):45:45 -> a
-    2:3:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):66:67 -> a
-    4:4:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):100:100 -> a
-    5:5:void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):106:106 -> a
-    6:6:void setDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):112:112 -> a
-    7:7:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):137:137 -> a
-    8:8:void setArgumentInfos(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):141:141 -> a
-    9:9:void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):146:146 -> a
-    10:12:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):159:161 -> a
-    13:14:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):169:170 -> a
-    15:15:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> a
-    16:16:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):184:184 -> a
-    17:17:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):195:195 -> a
-    18:18:void setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet):205:205 -> a
-    19:24:void fixupUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):209:214 -> a
-    25:25:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):256:256 -> a
-    26:27:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> a
-    26:27:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):256 -> a
-    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple getInstance():33:33 -> b
-    2:2:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):50:50 -> b
-    3:3:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):117:117 -> b
-    4:4:void methodNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):127:127 -> b
-    5:5:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):189:189 -> b
-    1:1:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):40:40 -> c
-    2:2:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> c
-    3:3:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):250:250 -> c
-    4:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> c
-    4:5:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):250 -> c
+    1:1:void markFieldAsDead(com.android.tools.r8.graph.DexEncodedField):46:46 -> a
+    2:3:void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):67:68 -> a
+    4:4:void methodReturnsArgument(com.android.tools.r8.graph.DexEncodedMethod,int):101:101 -> a
+    5:5:void methodReturnsAbstractValue(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue):107:107 -> a
+    6:6:void setDynamicReturnType(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType):113:113 -> a
+    7:7:void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):138:138 -> a
+    8:8:void setArgumentInfos(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):142:142 -> a
+    9:9:void setBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):147:147 -> a
+    10:10:void setConvertCheckNotNull(com.android.tools.r8.graph.DexClassAndMethod):157:157 -> a
+    11:13:void setEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.enums.classification.EnumUnboxerMethodClassification):164:166 -> a
+    14:15:void setInstanceInitializerInfoCollection(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection):174:175 -> a
+    16:16:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):180:180 -> a
+    17:17:void setNonNullParamOrThrow(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):189:189 -> a
+    18:18:void setSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.inlining.SimpleInliningConstraint):200:200 -> a
+    19:19:void setUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.BitSet):210:210 -> a
+    20:25:void fixupUnusedArguments(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):214:219 -> a
+    26:26:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):261:261 -> a
+    27:28:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> a
+    27:28:void unsetForceInline(com.android.tools.r8.graph.ProgramMethod):261 -> a
+    1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple getInstance():34:34 -> b
+    2:2:void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField):51:51 -> b
+    3:3:void methodMayNotHaveSideEffects(com.android.tools.r8.graph.DexEncodedMethod):118:118 -> b
+    4:4:void methodNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):128:128 -> b
+    5:5:void setNonNullParamOnNormalExits(com.android.tools.r8.graph.DexEncodedMethod,java.util.BitSet):194:194 -> b
+    1:1:void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField):41:41 -> c
+    2:2:void markInlinedIntoSingleCallSite(com.android.tools.r8.graph.DexEncodedMethod):85:85 -> c
+    3:3:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):255:255 -> c
+    4:5:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> c
+    4:5:void unsetEnumUnboxerMethodClassification(com.android.tools.r8.graph.ProgramMethod):255 -> c
     void methodReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.DexEncodedMethod) -> d
-    1:1:void setIsReturnValueUsed(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.ProgramMethod):179:179 -> d
-    1:1:void setMultiCallerMethod(com.android.tools.r8.graph.ProgramMethod):72:72 -> e
-    2:2:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):200:200 -> e
-    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):89:89 -> f
-    2:2:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):222:222 -> f
-    3:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> f
-    3:4:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):222 -> f
-    1:1:void unsetBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod):228:228 -> g
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):339:340 -> g
-    2:3:void unsetBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod):228 -> g
-    4:4:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):233:233 -> g
-    5:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> g
-    5:6:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):233 -> g
-    1:1:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):239:239 -> h
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> h
-    2:3:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):239 -> h
-    1:1:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):245:245 -> i
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> i
-    2:3:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):245 -> i
-    1:1:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):261:261 -> j
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> j
-    2:3:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):261 -> j
-    1:1:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):267:267 -> k
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> k
-    2:3:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):267 -> k
-    1:1:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):273:273 -> l
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> l
-    2:3:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):273 -> l
-    1:1:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):279:279 -> m
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> m
-    2:3:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):279 -> m
-    1:1:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):285:285 -> n
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> n
-    2:3:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):285 -> n
-    1:1:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):291:291 -> o
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> o
-    2:3:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):291 -> o
-    1:1:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):297:297 -> p
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> p
-    2:3:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):297 -> p
-    1:1:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):303:303 -> q
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> q
-    2:3:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):303 -> q
-    1:1:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):314:314 -> r
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> r
-    2:3:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):314 -> r
-    1:1:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):309:309 -> s
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> s
-    2:3:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):309 -> s
-    1:1:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):320:320 -> t
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> t
-    2:3:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):320 -> t
-    1:1:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):326:326 -> u
-    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):331:332 -> u
-    2:3:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):326 -> u
-com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.k10:
+    1:1:void setIsReturnValueUsed(com.android.tools.r8.utils.OptionalBool,com.android.tools.r8.graph.ProgramMethod):184:184 -> d
+    1:1:void setMultiCallerMethod(com.android.tools.r8.graph.ProgramMethod):73:73 -> e
+    2:2:void classInitializerMayBePostponed(com.android.tools.r8.graph.DexEncodedMethod):205:205 -> e
+    1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):90:90 -> f
+    2:2:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):227:227 -> f
+    3:4:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> f
+    3:4:void unsetAbstractReturnValue(com.android.tools.r8.graph.ProgramMethod):227 -> f
+    1:1:void unsetBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod):233:233 -> g
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):344:345 -> g
+    2:3:void unsetBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod):233 -> g
+    4:4:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):238:238 -> g
+    5:6:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> g
+    5:6:void unsetClassInitializerMayBePostponed(com.android.tools.r8.graph.ProgramMethod):238 -> g
+    1:1:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):244:244 -> h
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> h
+    2:3:void unsetClassInlinerMethodConstraint(com.android.tools.r8.graph.ProgramMethod):244 -> h
+    1:1:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):250:250 -> i
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> i
+    2:3:void unsetDynamicReturnType(com.android.tools.r8.graph.ProgramMethod):250 -> i
+    1:1:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):266:266 -> j
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> j
+    2:3:void unsetInitializedClassesOnNormalExit(com.android.tools.r8.graph.ProgramMethod):266 -> j
+    1:1:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):272:272 -> k
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> k
+    2:3:void unsetInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.ProgramMethod):272 -> k
+    1:1:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):278:278 -> l
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> l
+    2:3:void unsetInlinedIntoSingleCallSite(com.android.tools.r8.graph.ProgramMethod):278 -> l
+    1:1:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):284:284 -> m
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> m
+    2:3:void unsetInstanceInitializerInfoCollection(com.android.tools.r8.graph.ProgramMethod):284 -> m
+    1:1:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):290:290 -> n
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> n
+    2:3:void unsetMayNotHaveSideEffects(com.android.tools.r8.graph.ProgramMethod):290 -> n
+    1:1:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):296:296 -> o
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> o
+    2:3:void unsetNeverReturnsNormally(com.android.tools.r8.graph.ProgramMethod):296 -> o
+    1:1:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):302:302 -> p
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> p
+    2:3:void unsetNonNullParamOnNormalExits(com.android.tools.r8.graph.ProgramMethod):302 -> p
+    1:1:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):308:308 -> q
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> q
+    2:3:void unsetNonNullParamOrThrow(com.android.tools.r8.graph.ProgramMethod):308 -> q
+    1:1:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):319:319 -> r
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> r
+    2:3:void unsetReturnValueOnlyDependsOnArguments(com.android.tools.r8.graph.ProgramMethod):319 -> r
+    1:1:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):314:314 -> s
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> s
+    2:3:void unsetReturnedArgument(com.android.tools.r8.graph.ProgramMethod):314 -> s
+    1:1:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):325:325 -> t
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> t
+    2:3:void unsetSimpleInliningConstraint(com.android.tools.r8.graph.ProgramMethod):325 -> t
+    1:1:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):331:331 -> u
+    2:3:void com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple.withMutableMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):336:337 -> u
+    2:3:void unsetUnusedArguments(com.android.tools.r8.graph.ProgramMethod):331 -> u
+com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.G10:
     com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo INSTANCE -> a
     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 -> c
-com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.f6:
+com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer -> com.android.tools.r8.internal.h6:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:51: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
@@ -74980,25 +75122,25 @@
     59:60: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
     61:71:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeCheckCastBeforeInvoke(com.android.tools.r8.ir.code.CheckCast):99:109 -> a
     61:71:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):94 -> a
-    72:72:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():353:353 -> a
+    72:72:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():354:354 -> a
     72:72:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeCheckCastBeforeInvoke(com.android.tools.r8.ir.code.CheckCast):109 -> a
     72:72:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):94 -> a
     73:90:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeCheckCastBeforeInvoke(com.android.tools.r8.ir.code.CheckCast):112:129 -> a
     73:90:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):94 -> a
     91:99: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
     91:99:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
-    100:100:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():353:353 -> a
+    100:100:boolean com.android.tools.r8.ir.code.Value.hasSingleUniqueUser():354:354 -> a
     100:100: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
     100:100:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
     101:101: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
     101:101:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
-com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.H40:
+com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.d50:
     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.zi:
+com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Di:
     com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():25:25 -> <init>
@@ -75010,7 +75152,7 @@
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection getInstance():28:28 -> c
     1:1:java.lang.String toString():69:69 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.Lq:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.Qq:
     boolean $assertionsDisabled -> b
     int argumentIndex -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -75032,7 +75174,7 @@
     153:153:java.lang.String toString():74:74 -> toString
     154:154:java.lang.String toString():74:74 -> toString
     155:155:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.Mq:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.Rq:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     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,com.android.tools.r8.graph.GraphLens) -> a
@@ -75040,7 +75182,7 @@
     boolean isSingleValue() -> f
     boolean isArgumentInitializationInfo() -> g
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> i
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Oq:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Tq:
     1:1:void <init>():25:25 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
@@ -75049,19 +75191,19 @@
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder():28:28 -> a
     boolean isEmpty() -> b
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.Nq:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.Sq:
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():53:53 -> <clinit>
     1:3:void <init>():53:55 -> <init>
     1:3: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):63:65 -> a
     4:7:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection build():71:74 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.Pq:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.Uq:
     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.Rq:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.Wq:
     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):27:29 -> <init>
@@ -75077,7 +75219,7 @@
     1:6:boolean equals(java.lang.Object):87:92 -> equals
     1:1:int hashCode():79:79 -> hashCode
     1:1:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.xJ:
+com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.EJ:
     java.util.TreeMap infos -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -75099,7 +75241,7 @@
     30:30:void lambda$toString$3(java.util.List,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):96:96 -> a
     boolean isEmpty() -> b
     1:4:java.lang.String toString():95:98 -> toString
-com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.u30:
+com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.Q30:
     com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
@@ -75107,7 +75249,7 @@
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo getInstance():24:24 -> b
     1:1:java.lang.String toString():46:46 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.ue:
+com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection -> com.android.tools.r8.internal.xe:
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo info -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo):19:20 -> <init>
     1:4:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection):41:44 -> a
@@ -75117,7 +75259,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect):14 -> b
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.ContextInsensitiveInstanceInitializerInfoCollection.getContextInsensitive():25:25 -> c
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():14 -> c
-com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.uf:
+com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.yf:
     com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo INSTANCE -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:1:void <init>():23:23 -> <init>
@@ -75129,7 +75271,7 @@
     boolean receiverNeverEscapesOutsideConstructorChain() -> g
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo getInstance():26:26 -> h
     1:1:java.lang.String toString():86:86 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Ai:
+com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection -> com.android.tools.r8.internal.Ei:
     com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection EMPTY -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -75140,7 +75282,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection.getContextInsensitive():27:27 -> c
     1:1:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive():14 -> c
     1:1:com.android.tools.r8.ir.optimize.info.initializer.EmptyInstanceInitializerInfoCollection getInstance():22:22 -> d
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.Xq:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.cr:
     1:1:void <init>():16:16 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo asNonTrivialInstanceInitializerInfo() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos() -> b
@@ -75149,7 +75291,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.Yq:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection -> com.android.tools.r8.internal.dr:
     1:1:void <init>():16:16 -> <init>
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection fixupAfterParametersChanged(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.proto.ArgumentInfoCollection) -> a
     1:1:boolean com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo.isNonTrivialInstanceInitializerInfo():0:0 -> a
@@ -75161,7 +75303,7 @@
     5:5:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfoCollection empty():23:23 -> a
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo get(com.android.tools.r8.ir.code.InvokeDirect) -> b
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo getContextInsensitive() -> c
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.zJ:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.GJ:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos -> b
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
@@ -75186,7 +75328,7 @@
     130:130:java.lang.String toString():127:127 -> toString
     131:131:java.lang.String toString():127:127 -> toString
     128:128:java.lang.String toString():127:127 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.yJ:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.FJ:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection instanceFieldInitializationInfos -> a
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet -> c
@@ -75246,7 +75388,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():200:200 -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():209:209 -> g
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():214:214 -> h
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.tf:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.xf:
     com.android.tools.r8.ir.conversion.callgraph.CallSiteInformation callSiteInformation -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions$InlinerOptions options -> c
@@ -75256,20 +75398,20 @@
     1:16: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):39:54 -> a
     17:23:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):68:74 -> a
     17:23: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
-    24:24:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    24:24:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     24:24:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):74 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:24:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
-    25:25:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    25:25:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     25:25:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):74 -> a
     25:25: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
     26:26:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):74:74 -> a
     26:26: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
-    27:27:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    27:27:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     27:27:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):75 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     27:27:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
-    28:28:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    28:28:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     28:28:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):75 -> a
     28:28: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):56 -> a
     29:29:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isSingleCallerInliningTarget(com.android.tools.r8.graph.ProgramMethod):75:75 -> a
@@ -75283,16 +75425,16 @@
     37:37:boolean com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy.isMultiCallerInlineCandidate(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):93:93 -> a
     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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):59 -> a
     38:42: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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):60:64 -> a
-com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.fl:
+com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.kl:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.Inliner$Reason):17:18 -> <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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor):28:28 -> a
-com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.yq:
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.Dq:
     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
     5:5:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:32 -> a
-    6:6:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():204:204 -> a
+    6:6:boolean com.android.tools.r8.ir.code.Value.hasAliasedValue():205:205 -> a
     6:6:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:8:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):32:33 -> a
@@ -75300,7 +75442,7 @@
     9:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):33 -> a
     10:10:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):36:36 -> a
     11:11: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.Aq:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.Fq:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> d
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> f
@@ -75328,7 +75470,7 @@
     19:19: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):56:56 -> b
     19:19:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):83 -> b
     1:1:boolean verifyIRCacheIsEmpty():108:108 -> c
-com.android.tools.r8.ir.optimize.inliner.InliningIRProvider$1 -> com.android.tools.r8.internal.zq:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider$1 -> com.android.tools.r8.internal.Eq:
     1:1:void <init>():44:44 -> <init>
     1:1:com.android.tools.r8.ir.code.IRCode getAndCacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):52:52 -> a
     2:2:void cacheInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):57:57 -> a
@@ -75336,9 +75478,9 @@
     4:4:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):72:72 -> a
     1:1:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):47:47 -> b
     boolean verifyIRCacheIsEmpty() -> c
-com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Cq:
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Hq:
     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,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.conversion.MethodProcessor) -> a
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.BJ:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.IJ:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -75375,7 +75517,7 @@
     void reportUnknownTarget() -> u
     boolean unsetReasonHasBeenReportedFlag() -> v
     1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():22:22 -> w
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.h50:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.D50:
     1:1:void <init>():19:19 -> <init>
     void reportCallerHasUnknownApiLevel() -> a
     void reportIncorrectArity(int,int) -> a
@@ -75411,7 +75553,7 @@
     void reportRecursiveMethod() -> t
     void reportUnknownTarget() -> u
     boolean unsetReasonHasBeenReportedFlag() -> v
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.i50:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.E50:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.ProgramMethod context -> b
     com.android.tools.r8.graph.ProgramMethod callee -> a
@@ -75478,23 +75620,23 @@
     1:1:void reportRecursiveMethod():227:227 -> t
     1:1:void reportUnknownTarget():232:232 -> u
     1:2:boolean unsetReasonHasBeenReportedFlag():288:289 -> v
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph -> com.android.tools.r8.internal.IH:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph -> com.android.tools.r8.internal.PH:
     1:1:void <init>(java.util.Map):16:16 -> <init>
     1:1:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder builder(com.android.tools.r8.graph.AppView):20:20 -> a
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder -> com.android.tools.r8.internal.JH:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder -> com.android.tools.r8.internal.QH:
     1:1:void <init>(com.android.tools.r8.graph.AppView):21:21 -> <init>
     1:1:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraphBuilder.createNode(com.android.tools.r8.graph.ProgramMethod):26:26 -> a
     1:1:com.android.tools.r8.ir.conversion.callgraph.NodeBase createNode(com.android.tools.r8.graph.ProgramMethod):17 -> a
     2:3:com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerCallGraph build(java.util.concurrent.ExecutorService):31:32 -> a
     4:4:void processClass(com.android.tools.r8.graph.DexProgramClass):36:36 -> a
     1:4:void processMethod(com.android.tools.r8.graph.ProgramMethod):40:43 -> c
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerInvokeRegistry -> com.android.tools.r8.internal.KH:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerInvokeRegistry -> com.android.tools.r8.internal.RH:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode,java.util.function.Function,java.util.Map):28:28 -> <init>
     1:1:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     1:1:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):40 -> a
     2:3:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):41:42 -> a
     1:1:com.android.tools.r8.graph.GraphLens getCodeLens():33:33 -> c
-com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode -> com.android.tools.r8.internal.LH:
+com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode -> com.android.tools.r8.internal.SH:
     java.util.concurrent.atomic.AtomicInteger numberOfCallSites -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
@@ -75507,7 +75649,7 @@
     5:5:void com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode.addReaderConcurrently(com.android.tools.r8.ir.optimize.inliner.multicallerinliner.MultiCallerInlinerNode):28:28 -> a
     5:5:void addReaderConcurrently(com.android.tools.r8.ir.conversion.callgraph.NodeBase):12 -> a
     1:1:int getNumberOfCallSites():32:32 -> c
-com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.H5:
+com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer -> com.android.tools.r8.internal.J5:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):29:31 -> <init>
@@ -75536,7 +75678,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):101:101 -> a
     31:37:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):53 -> a
     1:1:com.android.tools.r8.graph.DexType getType():36:36 -> getType
-com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer -> com.android.tools.r8.internal.o6:
+com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer -> com.android.tools.r8.internal.q6:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):25:27 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):44:44 -> a
@@ -75558,14 +75700,14 @@
     11:12:void com.android.tools.r8.ir.optimize.library.ByteMethodOptimizer.optimizeByteValue(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):57:58 -> a
     11:12:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):45 -> a
     1:1:com.android.tools.r8.graph.DexType getType():32:32 -> getType
-com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.hj:
+com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.mj:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):29:30 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):47:47 -> a
-    2:2:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    2:2:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):47 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    3:3:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     3:3:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):47 -> a
     4:6:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):48:50 -> a
     7:26:void com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer.insertAssumeDynamicType(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):60:79 -> a
@@ -75583,7 +75725,7 @@
     30:31:void com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer.insertAssumeDynamicType(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):83:84 -> a
     30:31:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):50 -> a
     1:1:com.android.tools.r8.graph.DexType getType():35:35 -> getType
-com.android.tools.r8.ir.optimize.library.FieldSynthesis -> com.android.tools.r8.internal.Qk:
+com.android.tools.r8.ir.optimize.library.FieldSynthesis -> com.android.tools.r8.internal.Vk:
     1:3:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):27:29 -> a
     4:4:com.android.tools.r8.graph.ClasspathOrLibraryClass com.android.tools.r8.graph.ClasspathOrLibraryClass.asClasspathOrLibraryClass(com.android.tools.r8.graph.DexClass):16:16 -> a
     4:4:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):29 -> a
@@ -75594,7 +75736,7 @@
     17:17:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):43 -> a
     18:18:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):44:44 -> a
     19:19:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):35:35 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.dD:
+com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.jD:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map libraryMethodModelCollections -> d
     java.util.Set modeledLibraryTypes -> c
@@ -75623,11 +75765,11 @@
     58:58:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():208:208 -> a
     58:58:boolean isFinalLibraryField(com.android.tools.r8.graph.DexEncodedField):85 -> a
     59:59:boolean isFinalLibraryField(com.android.tools.r8.graph.DexEncodedField):85:85 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.fD:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.lD:
     com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor) -> a
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext) -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.eD:
-com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.jD:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State -> com.android.tools.r8.internal.kD:
+com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.pD:
     java.util.Map finalMethodsWithoutSideEffects -> a
     java.util.Set nonFinalMethodsWithoutSideEffects -> c
     java.util.Set unconditionalFinalMethodsWithoutSideEffects -> b
@@ -75652,7 +75794,7 @@
     2:2:boolean lambda$buildFinalMethodsWithoutSideEffects$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,java.util.List):56:56 -> b
     3:29:java.util.Set buildUnconditionalFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):71:97 -> b
     1:1:boolean lambda$buildFinalMethodsWithoutSideEffects$2(com.android.tools.r8.graph.DexMethod,java.util.List):52:52 -> c
-com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.lD:
+com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.rD:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set modeledLibraryTypes -> d
@@ -75727,8 +75869,9 @@
     57:57:void run():50 -> d
     58:61:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():157:160 -> d
     58:61:void run():50 -> d
-com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.nE:
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.uE:
     com.android.tools.r8.graph.AppView appView -> a
+    boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.DexMethod wtfMethod -> i
     com.android.tools.r8.graph.DexMethod eMethod -> h
     com.android.tools.r8.graph.DexMethod wMethod -> g
@@ -75737,6 +75880,7 @@
     com.android.tools.r8.graph.DexMethod dMethod -> e
     com.android.tools.r8.graph.DexMethod vMethod -> d
     com.android.tools.r8.graph.DexMethod isLoggableMethod -> c
+    1:1:void <clinit>():22:22 -> <clinit>
     1:10:void <init>(com.android.tools.r8.graph.AppView):43:52 -> <init>
     11:19:void <init>(com.android.tools.r8.graph.AppView):50:58 -> <init>
     20:28:void <init>(com.android.tools.r8.graph.AppView):56:64 -> <init>
@@ -75746,17 +75890,26 @@
     56:64:void <init>(com.android.tools.r8.graph.AppView):80:88 -> <init>
     65:65:void <init>(com.android.tools.r8.graph.AppView):86:86 -> <init>
     1:3:boolean isEnabled(com.android.tools.r8.graph.AppView):94:96 -> a
-    4:38:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):113:147 -> 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):154:157 -> a
+    4:43:int com.android.tools.r8.ir.optimize.library.LogMethodOptimizer.getLogLevel(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):128:167 -> a
+    4:43:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):115 -> a
+    44:44:int com.android.tools.r8.ir.optimize.library.LogMethodOptimizer.getLogLevel(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):159:159 -> a
+    44:44:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):115 -> a
+    45:57:int com.android.tools.r8.ir.optimize.library.LogMethodOptimizer.getLogLevel(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):141:153 -> a
+    45:57:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):115 -> a
+    58:58:int com.android.tools.r8.ir.optimize.library.LogMethodOptimizer.getLogLevel(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):136:136 -> a
+    58:58:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):115 -> a
+    59:59:int com.android.tools.r8.ir.optimize.library.LogMethodOptimizer.getLogLevel(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod):131:131 -> a
+    59:59:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):115 -> a
+    60:63:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):116:119 -> a
     1:1:com.android.tools.r8.graph.DexType getType():101:101 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.dM:
+com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.uM:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):23:24 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):41:41 -> 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):47:49 -> a
     2:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):42 -> a
     1:1:com.android.tools.r8.graph.DexType getType():29:29 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.vM:
+com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.MM:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -75765,10 +75918,10 @@
     1:1:void <clinit>():26:26 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView):33:38 -> <init>
     1:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):55:56 -> a
-    3:3:byte com.android.tools.r8.graph.DexString.byteAt(int):54:54 -> a
+    3:3:byte com.android.tools.r8.graph.DexString.byteAt(int):58:58 -> a
     3:3:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):56 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:byte com.android.tools.r8.graph.DexString.byteAt(int):54:54 -> a
+    4:4:byte com.android.tools.r8.graph.DexString.byteAt(int):58:58 -> a
     4:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):56 -> a
     5:5:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):68:68 -> a
     6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():294:294 -> a
@@ -75831,11 +75984,11 @@
     64:64:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
     65:74:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):186:195 -> a
     65:74:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
-    75:75:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    75:75:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     75:75:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):195 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     75:75:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
-    76:76:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():691:691 -> a
+    76:76:boolean com.android.tools.r8.graph.AppView.hasClassHierarchy():703:703 -> a
     76:76:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):195 -> a
     76:76:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):79 -> a
     77:79:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexClassAndMethod):196:196 -> a
@@ -75877,19 +76030,19 @@
     138:138:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeEquals(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):122:122 -> a
     138:138:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set):59 -> a
     1:1:com.android.tools.r8.graph.DexType getType():43:43 -> getType
-com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.LY:
+com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection -> com.android.tools.r8.internal.gZ:
     1:1:void <init>():19:19 -> <init>
     com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State createInitialState(com.android.tools.r8.ir.conversion.MethodProcessor) -> a
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set) -> a
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):19:19 -> 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.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):48:48 -> a
     2:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set,java.util.Set,com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection$State,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):19 -> a
-com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.KY:
+com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$$ExternalSyntheticThrowCCEIfNotNull0 -> com.android.tools.r8.internal.fZ:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     void com.android.tools.r8.ir.optimize.library.StatelessLibraryMethodModelCollection$$InternalSyntheticThrowCCEIfNotNull$54$a45cf4883edbf7d524f6dd82ceaf6eb6b32f4f6bf2ef1c90a926aae8bee744ee$0.m(java.lang.Object) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.jZ:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer -> com.android.tools.r8.internal.EZ:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -75975,7 +76128,7 @@
     90:90:void optimizeAppend(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,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):109 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods access$100(com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer):45:45 -> b
     1:1:com.android.tools.r8.graph.DexType getType():67:67 -> getType
-com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.iZ:
+com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer$State -> com.android.tools.r8.internal.DZ:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap unusedBuilders -> b
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> a
     com.android.tools.r8.ir.optimize.library.StringBuilderMethodOptimizer this$0 -> c
@@ -76004,7 +76157,7 @@
     156:156:void computeIsUnusedBuilder(com.android.tools.r8.ir.code.Value):192:192 -> a
     157:157:void lambda$computeIsUnusedBuilder$0(boolean,com.android.tools.r8.ir.code.Value):192:192 -> a
     1:5:boolean isUnusedBuilder(com.android.tools.r8.ir.code.Value):180:184 -> b
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.pZ:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.KZ:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):32:34 -> <init>
@@ -76035,30 +76188,201 @@
     52:52:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):128 -> a
     53:55:boolean isPrunedClassNameComparison(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):128:130 -> a
     1:1:com.android.tools.r8.graph.DexType getType():39:39 -> getType
-com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.Vw:
+com.android.tools.r8.ir.optimize.library.sideeffects.JavaLangObjectsSideEffectCollection -> com.android.tools.r8.internal.bx:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:20:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):22:41 -> a
-    21:21:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):770:770 -> a
-    21:21:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):44 -> a
+    21:21:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    21:21:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):41 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    22:22:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):770:770 -> a
-    22:22:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):44 -> a
-    23:28: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.Q3:
-    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
-    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.AssumeInfoLookup -> com.android.tools.r8.internal.R3:
-    1:15:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMember):36:50 -> a
-com.android.tools.r8.ir.optimize.outliner.OutlineCollection -> com.android.tools.r8.internal.gN:
+    22:22:boolean com.android.tools.r8.shaking.AssumeInfoCollection.isSideEffectFree(com.android.tools.r8.graph.DexMember):49:49 -> a
+    22:22:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):41 -> a
+    23:32:boolean toStringMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.List):45:54 -> a
+com.android.tools.r8.ir.optimize.membervaluepropagation.D8MemberValuePropagation -> com.android.tools.r8.internal.Je:
+    1:1:void <init>(com.android.tools.r8.graph.AppView):27:27 -> <init>
+    void rewriteArrayGet(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.ArrayGet) -> a
+    void rewriteInstanceGet(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.InstanceGet) -> a
+    void rewriteInstancePut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut) -> a
+    void rewriteInvokeMethod(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) -> a
+    void rewriteStaticPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut) -> a
+    1:2:void rewriteStaticGet(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.StaticGet):73:74 -> a
+com.android.tools.r8.ir.optimize.membervaluepropagation.MemberValuePropagation -> com.android.tools.r8.internal.aG:
+    com.android.tools.r8.graph.AppView appView -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():45:45 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView):49:50 -> <init>
+    void rewriteArrayGet(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.ArrayGet) -> a
+    void rewriteInstanceGet(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.InstanceGet) -> a
+    void rewriteInstancePut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut) -> a
+    void rewriteInvokeMethod(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) -> a
+    void rewriteStaticGet(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.StaticGet) -> a
+    void rewriteStaticPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut) -> a
+    1:8:void run(com.android.tools.r8.ir.code.IRCode):59:66 -> a
+    9:9:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
+    9:9:void run(com.android.tools.r8.ir.code.IRCode):66 -> a
+    10:13:void run(com.android.tools.r8.ir.code.IRCode):66:69 -> a
+    14:46:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):77:109 -> a
+    47:47:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):106:106 -> a
+    48:48:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):103:103 -> a
+    49:49:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):102:102 -> a
+    50:50:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):95:95 -> a
+    51:51:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):92:92 -> a
+    52:52:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):91:91 -> a
+    53:53:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):88:88 -> a
+    54:62:boolean applyAssumeInfo(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):160:168 -> a
+    63:63:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNumberFromIntervalValue():0:0 -> a
+    63:63:boolean applyAssumeInfo(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):168 -> a
+    64:64:boolean applyAssumeInfo(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):169:169 -> a
+    65:73:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.membervaluepropagation.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):220:228 -> a
+    65:73:boolean applyAssumeInfo(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
+    74:74:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):41:41 -> a
+    74:74:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.optimize.membervaluepropagation.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):228 -> a
+    74:74:boolean applyAssumeInfo(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
+    75:84:boolean applyAssumeInfo(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):178:187 -> a
+    85:85:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    85:85:boolean applyAssumeInfo(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):189 -> a
+    86:86:boolean applyAssumeInfo(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):190:190 -> a
+    87:87:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    87:87:boolean applyAssumeInfo(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):191 -> a
+    88:90:boolean applyAssumeInfo(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):192:194 -> a
+    91:111:boolean applyAssumeInfo(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):193:213 -> a
+com.android.tools.r8.ir.optimize.membervaluepropagation.R8MemberValuePropagation -> com.android.tools.r8.internal.wS:
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> c
+    boolean $assertionsDisabled -> d
+    1:3:void <clinit>():42:44 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):47:47 -> <init>
+    1:35:void rewriteArrayGet(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.ArrayGet):57:91 -> a
+    36:36:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):41:41 -> a
+    36:36:void rewriteArrayGet(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.ArrayGet):91 -> a
+    37:48:void rewriteArrayGet(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.ArrayGet):92:103 -> a
+    49:69:void rewriteInvokeMethod(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):129:149 -> a
+    70:71:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):19:20 -> a
+    70:71:void rewriteInvokeMethod(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):149 -> a
+    72:72:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection.get(com.android.tools.r8.graph.DexClassAndMember):45:45 -> a
+    72:72:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):20 -> a
+    72:72:void rewriteInvokeMethod(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):149 -> a
+    73:73:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection.get(com.android.tools.r8.graph.DexClassAndMember):45:45 -> a
+    73:73:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):22 -> a
+    73:73:void rewriteInvokeMethod(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):149 -> a
+    74:74:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfoLookup.lookupAssumeInfo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClassAndMethod):24:24 -> a
+    74:74:void rewriteInvokeMethod(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):149 -> a
+    75:75:void rewriteInvokeMethod(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):150:150 -> a
+    76:76:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    76:76:boolean com.android.tools.r8.ir.optimize.membervaluepropagation.R8MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):115 -> a
+    76:76:void rewriteInvokeMethod(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):155 -> a
+    77:79:boolean com.android.tools.r8.ir.optimize.membervaluepropagation.R8MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):116:118 -> a
+    77:79:void rewriteInvokeMethod(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):155 -> a
+    80:95:void rewriteInvokeMethod(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):160:175 -> a
+    96:96:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):41:41 -> a
+    96:96:void rewriteInvokeMethod(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):176 -> a
+    97:103:void rewriteInvokeMethod(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):177:183 -> a
+    104:104:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
+    104:104:void rewriteInvokeMethod(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):184 -> a
+    105:107:void rewriteInvokeMethod(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):185:185 -> a
+    112:123:void rewriteInvokeMethod(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):190:201 -> a
+    124:124:void rewriteInstanceGet(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.InstanceGet):214:214 -> a
+    125:125:void rewriteStaticGet(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.StaticGet):224:224 -> a
+    126:134:void rewriteFieldGet(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):233:241 -> a
+    135:145:void rewriteFieldGet(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):240:250 -> a
+    146:146:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    146:146:void rewriteFieldGet(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):250 -> a
+    147:150:void rewriteFieldGet(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):254:257 -> a
+    151:151:void rewriteFieldGet(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):256:256 -> a
+    152:152:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    152:152:boolean com.android.tools.r8.ir.optimize.membervaluepropagation.R8MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):108 -> a
+    152:152:void rewriteFieldGet(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):261 -> a
+    153:155:boolean com.android.tools.r8.ir.optimize.membervaluepropagation.R8MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndField):109:111 -> a
+    153:155:void rewriteFieldGet(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):261 -> a
+    156:156:void rewriteFieldGet(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):266:266 -> a
+    157:157:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection.get(com.android.tools.r8.graph.DexClassAndMember):45:45 -> a
+    157:157:void rewriteFieldGet(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):266 -> a
+    158:180:void rewriteFieldGet(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):267:289 -> a
+    181:201:void rewriteFieldGet(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):287:307 -> a
+    202:202:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):41:41 -> a
+    202:202:void rewriteFieldGet(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):308 -> a
+    203:204:void rewriteFieldGet(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):309:310 -> a
+    205:205:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    205:205:void rewriteFieldGet(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):314 -> a
+    206:210:void rewriteFieldGet(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):315:319 -> a
+    211:226:void rewriteFieldGet(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:333 -> a
+    227:227:java.lang.Boolean lambda$rewriteFieldGet$0(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):241:241 -> a
+    228:240:void com.android.tools.r8.ir.optimize.membervaluepropagation.R8MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):345:357 -> a
+    228:240:void rewriteInstancePut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):340 -> a
+    241:254:void com.android.tools.r8.ir.optimize.membervaluepropagation.R8MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):367:380 -> a
+    241:254:void rewriteStaticPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):362 -> a
+    255:255:void com.android.tools.r8.ir.optimize.membervaluepropagation.R8MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):379:379 -> a
+    255:255:void rewriteStaticPut(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):362 -> a
+com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo -> com.android.tools.r8.internal.R3:
+    com.android.tools.r8.ir.analysis.type.DynamicType assumeType -> a
+    boolean $assertionsDisabled -> e
+    com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo EMPTY -> d
+    com.android.tools.r8.ir.analysis.value.AbstractValue assumeValue -> b
+    boolean isSideEffectFree -> c
+    1:4:void <clinit>():17:20 -> <clinit>
+    5:5:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> <clinit>
+    5:5:void <clinit>():20 -> <clinit>
+    6:6:void <clinit>():20:20 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):26:29 -> <init>
+    boolean access$500(boolean,boolean) -> a
+    1:1:boolean access$000(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):17:17 -> a
+    2:2:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder builder():33:33 -> a
+    3:3:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo create(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):38:38 -> a
+    4:4:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.empty():44:44 -> a
+    4:4:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo create(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):39 -> a
+    5:5:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo create(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.value.AbstractValue,boolean):40:40 -> a
+    6:15:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetType(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.type.DynamicType):76:85 -> a
+    6:15:com.android.tools.r8.ir.analysis.type.DynamicType access$300(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.type.DynamicType):17 -> a
+    16:22:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):89:95 -> a
+    16:22:com.android.tools.r8.ir.analysis.value.AbstractValue access$400(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):17 -> a
+    23:23:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> a
+    23:23:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):98 -> a
+    23:23:com.android.tools.r8.ir.analysis.value.AbstractValue access$400(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):17 -> a
+    24:27:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):108:111 -> a
+    28:28:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):333:333 -> a
+    28:28:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):112 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    29:29:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):116:116 -> a
+    30:30:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.empty():28:28 -> a
+    30:30:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):117 -> a
+    31:32:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):117:118 -> a
+    33:38:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):126:131 -> a
+    39:39:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> a
+    39:39:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):131 -> a
+    40:40:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):131:131 -> a
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue access$100(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):17:17 -> b
+    2:2:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo empty():44:44 -> b
+    1:1:com.android.tools.r8.ir.analysis.type.DynamicType access$200(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):17:17 -> c
+    2:2:com.android.tools.r8.ir.analysis.type.DynamicType getAssumeType():48:48 -> c
+    1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAssumeValue():52:52 -> d
+    2:2:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):68:68 -> d
+    3:12:com.android.tools.r8.ir.analysis.type.DynamicType com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetType(com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.ir.analysis.type.DynamicType):76:85 -> d
+    3:12:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):68 -> d
+    13:13:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):69:69 -> d
+    14:20:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):89:95 -> d
+    14:20:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):69 -> d
+    21:21:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> d
+    21:21:com.android.tools.r8.ir.analysis.value.AbstractValue com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.internalMeetValue(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValue):98 -> d
+    21:21:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):69 -> d
+    22:24:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):70:72 -> d
+    1:1:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo.empty():44:44 -> e
+    1:1:boolean isEmpty():56 -> e
+    2:2:boolean isEmpty():59:59 -> e
+    1:6:boolean equals(java.lang.Object):141:146 -> equals
+    1:1:boolean isSideEffectFree():64:64 -> f
+    1:1:int hashCode():152:152 -> hashCode
+com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder -> com.android.tools.r8.internal.Q3:
+    com.android.tools.r8.ir.analysis.type.DynamicType assumeType -> a
+    com.android.tools.r8.ir.analysis.value.AbstractValue assumeValue -> b
+    boolean isSideEffectFree -> c
+    1:5:void <init>():155:159 -> <init>
+    1:3:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):162:164 -> a
+    4:4:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder.meetIsSideEffectFree(boolean):178:178 -> a
+    4:4:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder meet(com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):164 -> a
+    5:5:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder meetAssumeType(com.android.tools.r8.ir.analysis.type.DynamicType):168:168 -> a
+    6:6:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder meetAssumeValue(com.android.tools.r8.ir.analysis.value.AbstractValue):173:173 -> a
+    7:7:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo build():188:188 -> a
+    1:1:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder setIsSideEffectFree():183:183 -> b
+com.android.tools.r8.ir.optimize.outliner.OutlineCollection -> com.android.tools.r8.internal.xN:
     java.util.Map canonicalization -> a
     java.util.Map outlines -> c
     com.android.tools.r8.graph.GraphLens appliedGraphLens -> b
@@ -76086,7 +76410,7 @@
     48:51:void lambda$computeMethodsPerOutline$2(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMethod,java.util.List):100:103 -> a
     52:61:void lambda$computeMethodsPerOutline$2(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMethod,java.util.List):102:111 -> a
     1:5:com.android.tools.r8.utils.collections.ProgramMethodSet computeMethodsSubjectToOutlining(com.android.tools.r8.graph.AppView):84:88 -> b
-com.android.tools.r8.ir.optimize.outliner.Outliner -> com.android.tools.r8.internal.jN:
+com.android.tools.r8.ir.optimize.outliner.Outliner -> com.android.tools.r8.internal.AN:
     1:1:void <init>():19:19 -> <init>
     void collectOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing) -> a
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -76098,7 +76422,7 @@
     3:3:com.android.tools.r8.ir.optimize.outliner.Outliner empty():26:26 -> a
     void onMethodPruned(com.android.tools.r8.graph.ProgramMethod) -> b
     void rewriteWithLens() -> b
-com.android.tools.r8.ir.optimize.outliner.Outliner$1 -> com.android.tools.r8.internal.iN:
+com.android.tools.r8.ir.optimize.outliner.Outliner$1 -> com.android.tools.r8.internal.zN:
     1:1:void <init>():26:26 -> <init>
     void collectOutlineSites(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing) -> a
     void onMethodCodePruned(com.android.tools.r8.graph.ProgramMethod) -> a
@@ -76106,7 +76430,7 @@
     void prepareForPrimaryOptimizationPass(com.android.tools.r8.graph.GraphLens) -> a
     void onMethodPruned(com.android.tools.r8.graph.ProgramMethod) -> b
     void rewriteWithLens() -> b
-com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.O4:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockMuncher -> com.android.tools.r8.internal.Q4:
     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
@@ -76122,10 +76446,10 @@
     30:42:void runPeepholes(com.android.tools.r8.ir.code.IRCode,java.util.List,com.android.tools.r8.utils.InternalOptions):67:79 -> a
     43:43:java.lang.Object com.android.tools.r8.ir.code.BasicBlockIterator.next():11:11 -> a
     43:43: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.P4:
+com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.R4:
     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.ki:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.oi:
     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
@@ -76137,7 +76461,7 @@
     2:2:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):31 -> a
     3:3:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     4:37:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:74 -> a
-    38:38:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    38:38:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     38:38:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):75 -> a
     39:39:void com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper.resetPrevious(com.android.tools.r8.ir.code.InstructionListIterator,int):33:33 -> a
     39:39:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):78 -> a
@@ -76149,7 +76473,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.dE:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.kE:
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point lastLoadExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
@@ -76158,12 +76482,12 @@
     1:8:void <init>():30:37 -> <init>
     boolean resetAfterMatch() -> a
     1:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:64 -> a
-    25:25:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    25:25:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> 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.FF:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.MF:
     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.xH:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.EH:
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoad -> d
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> e
     com.android.tools.r8.ir.code.Instruction insertPosition -> c
@@ -76196,11 +76520,11 @@
     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.ON:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.fO:
     java.util.function.Predicate getPredicate() -> a
     int getMin() -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.PN:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.gO:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
@@ -76211,7 +76535,7 @@
     23:23:boolean lambda$moveInstructionsUpToCurrentPosition$1(java.util.List,com.android.tools.r8.ir.code.Instruction):66:66 -> a
     1:4:int numberOfValuesPutOnStack(com.android.tools.r8.ir.code.Instruction):38:41 -> b
     5:5:boolean lambda$moveInstructionsUpToCurrentPosition$2(java.util.List,com.android.tools.r8.ir.code.Instruction):72:72 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.QN:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.hO:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -76220,7 +76544,7 @@
     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
     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.ZN:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.rO:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -76232,7 +76556,7 @@
     int getMin() -> b
     int getMax() -> c
     1:2:void setIndex(int):36:37 -> setIndex
-com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.LU:
+com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.gV:
     com.android.tools.r8.ir.optimize.peepholes.Point secondInstructionExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point debugPositionExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
@@ -76242,14 +76566,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.YY:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.tZ:
     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.ZY:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.uZ:
     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 -> d
@@ -76268,7 +76592,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.aZ:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.vZ:
     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
@@ -76283,7 +76607,7 @@
     2:2:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):42 -> a
     3:9:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):43:49 -> a
     10:50:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):85:125 -> a
-    51:51:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    51:51:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     51:51:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):125 -> a
     52:52:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):126:126 -> a
     1:1:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):56:56 -> b
@@ -76294,7 +76618,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.o50:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.K50:
     java.util.function.Predicate predicate -> a
     int index -> b
     boolean $assertionsDisabled -> c
@@ -76543,12 +76867,12 @@
     249:249:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):592 -> a
     250:284:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):593:627 -> a
     285:288:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):626:629 -> a
-    289:289:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    289:289:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     289:289:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):629 -> a
     290:291:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):630:631 -> a
     292:296:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):604:608 -> a
     297:300:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):606:609 -> a
-    301:301:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    301:301:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     301:301:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):609 -> a
     302:326:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):611:635 -> a
     327:327:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
@@ -76569,7 +76893,7 @@
     50:50:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1067:1067 -> b
     50:50:void removeTrivialBuilders():740 -> b
     51:59:void removeTrivialBuilders():742:750 -> b
-    60:60:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> b
+    60:60:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
     60:60:void removeTrivialBuilders():750 -> b
     61:83:void removeTrivialBuilders():754:776 -> b
     84:84:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1067:1067 -> b
@@ -76585,7 +76909,7 @@
     125:125:void removeTrivialBuilders():817 -> b
     126:128:void removeTrivialBuilders():817:819 -> b
     1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):313:313 -> c
-com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.rZ:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.MZ:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> i
@@ -76611,14 +76935,14 @@
     63:63:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):153 -> a
     64:97:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):154:187 -> a
     98:101:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):186:189 -> a
-    102:102:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    102:102:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     102:102:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):189 -> a
     103:109:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):190:196 -> a
     110:110:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     110:110:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):196 -> a
     111:115:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):199:203 -> a
     116:119:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):202:205 -> a
-    120:120:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    120:120:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     120:120:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):205 -> a
     121:169:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):206:254 -> a
     170:170:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
@@ -76636,7 +76960,7 @@
     200:200:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1199:1199 -> a
     200:200:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):287 -> a
     201:201:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):290:290 -> a
-    202:202:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    202:202:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     202:202:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):291 -> a
     203:204:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):294:295 -> a
     205:205:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> a
@@ -76659,16 +76983,16 @@
     245:245:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):334 -> a
     246:322:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):335:411 -> a
     323:324:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):393:394 -> a
-    325:325:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    325:325:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     325:325:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):395 -> a
     326:353:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):414:441 -> a
     354:356:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):440:442 -> a
-    357:357:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    357:357:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     357:357:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):443 -> a
     358:364:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.graph.DexString):469:475 -> a
     358:364:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):444 -> a
     365:365:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):446:446 -> a
-    366:366:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> a
+    366:366:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> a
     366:366:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):447 -> a
     367:368:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):490:491 -> a
     367:368:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):448 -> a
@@ -76696,7 +77020,7 @@
     21:21:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):510 -> b
     22:38:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):511:527 -> b
     39:41:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):526:528 -> b
-    42:42:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):41:41 -> b
+    42:42:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):40:40 -> b
     42:42:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):529 -> b
     43:80:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):530:567 -> b
     81:81:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):39:39 -> b
@@ -76710,19 +77034,19 @@
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$18(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):249:249 -> g
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):227:227 -> h
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229:229 -> i
-    2:2:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> i
+    2:2:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> i
     2:2:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229 -> i
     3:3:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):229:229 -> i
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):231:231 -> j
-com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.qZ:
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.LZ:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():574:574 -> <clinit>
     1:1:void <init>():577:577 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():580:580 -> 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):589:609 -> a
-com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.m9:
+com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.p9:
     1:4:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):33:36 -> a
-com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.J9:
+com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.M9:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> d
     com.android.tools.r8.utils.collections.SortedProgramMethodSet candidatesForInstanceOfOptimization -> c
@@ -77055,7 +77379,7 @@
     3126:3130:boolean argumentsAreAlreadyLinked(com.android.tools.r8.ir.code.Invoke):2941:2945 -> a
     3126:3130:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2836 -> a
     3131:3164:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2837:2870 -> a
-    3165:3166:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():737:738 -> a
+    3165:3166:boolean com.android.tools.r8.ir.code.Value.hasRegisterConstraint():738:739 -> a
     3165:3166:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2872 -> a
     3167:3167:void generateArgumentMoves(com.android.tools.r8.ir.code.Invoke,com.android.tools.r8.ir.code.InstructionListIterator):2873:2873 -> a
     3168:3169:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):2821:2822 -> a
@@ -77661,7 +77985,7 @@
     6:6:boolean isRematerializable():116:116 -> z
     6:6:boolean isSpilledAndRematerializable():128 -> z
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.ZD:
+com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.gE:
     int position -> b
     int limit -> c
     1:3:void <init>(int,int):12:14 -> <init>
@@ -77673,7 +77997,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.bE:
+com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.iE:
     com.android.tools.r8.ir.regalloc.LiveRange INFINITE -> d
     int start -> b
     int end -> c
@@ -77693,7 +78017,7 @@
     61:61:java.lang.String toString():28:28 -> toString
     62:62:java.lang.String toString():28:28 -> toString
     63:63:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.vU:
+com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.QU:
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     void allocateRegisters() -> a
     int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
@@ -77702,7 +78026,7 @@
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     int registersUsed() -> b
     com.android.tools.r8.utils.InternalOptions options() -> c
-com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.wU:
+com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.RU:
     com.android.tools.r8.ir.analysis.type.TypeElement type -> b
     com.android.tools.r8.ir.code.Instruction definition -> e
     boolean $assertionsDisabled -> f
@@ -77722,7 +78046,7 @@
     2:28:int compareTo(java.lang.Object):13 -> compareTo
     1:5:boolean equals(java.lang.Object):68:72 -> equals
     1:1:int hashCode():63:63 -> hashCode
-com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.xU:
+com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.SU:
     java.util.Map valueMap -> b
     int tempRegister -> f
     java.util.Set moveSet -> a
@@ -77930,10 +78254,10 @@
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider() -> z0
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.internal.t1:
     com.android.tools.r8.ir.conversion.SourceCode get(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.ir.synthetic.CallObjectInitCfCodeProvider -> com.android.tools.r8.internal.I6:
+com.android.tools.r8.ir.synthetic.CallObjectInitCfCodeProvider -> com.android.tools.r8.internal.K6:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):23:23 -> <init>
     1:6:com.android.tools.r8.graph.CfCode generateCfCode():28:33 -> b
-com.android.tools.r8.ir.synthetic.EmulateDispatchSyntheticCfCodeProvider -> com.android.tools.r8.internal.Ji:
+com.android.tools.r8.ir.synthetic.EmulateDispatchSyntheticCfCodeProvider -> com.android.tools.r8.internal.Ni:
     java.util.LinkedHashMap extraDispatchCases -> e
     com.android.tools.r8.graph.DexMethod interfaceMethod -> d
     com.android.tools.r8.graph.DexMethod forwardingMethod -> c
@@ -77948,7 +78272,7 @@
     46:59:com.android.tools.r8.graph.CfCode generateCfCode():91:104 -> b
     60:63: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.sj:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.xj:
     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>
@@ -77960,14 +78284,14 @@
     7:7:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):56 -> a
     8:13:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):56:61 -> a
     14:19:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):59:64 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.qj:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.vj:
     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
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumDataMap$EnumData,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):85:88 -> <init>
     1:8:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfFrame$Builder,java.lang.Integer,com.android.tools.r8.ir.analysis.value.AbstractValue):109:116 -> a
     1:30:com.android.tools.r8.graph.CfCode generateCfCode():100:129 -> b
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.rj:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.wj:
     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):143:145 -> <init>
@@ -77987,7 +78311,7 @@
     245:247:com.android.tools.r8.graph.CfCode generateCfCode():198:200 -> b
     248:248:com.android.tools.r8.graph.CfCode generateCfCode():199:199 -> b
     249:263:com.android.tools.r8.graph.CfCode generateCfCode():195:209 -> b
-com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.mk:
+com.android.tools.r8.ir.synthetic.FieldAccessorBuilder -> com.android.tools.r8.internal.rk:
     com.android.tools.r8.utils.OptionalBool isSetter -> c
     com.android.tools.r8.utils.OptionalBool isInstanceField -> b
     boolean $assertionsDisabled -> e
@@ -78057,7 +78381,7 @@
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder builder():35:35 -> b
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setGetter():57:57 -> c
     1:1:com.android.tools.r8.ir.synthetic.FieldAccessorBuilder setSetter():68:68 -> d
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.Gl:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.Ll:
     java.lang.Boolean isInterface -> g
     boolean isConstructorDelegate -> i
     boolean $assertionsDisabled -> k
@@ -78174,12 +78498,12 @@
     1:2:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setStaticSource(com.android.tools.r8.graph.DexMethod):98:99 -> c
     3:5:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setSuperTarget(com.android.tools.r8.graph.DexMethod,boolean):111:113 -> c
     1:3:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setVirtualTarget(com.android.tools.r8.graph.DexMethod,boolean):118:120 -> d
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Fl:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Kl:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.Il:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.Nl:
     com.android.tools.r8.graph.DexType targetReceiver -> l
     com.android.tools.r8.graph.DexMethod target -> m
     boolean castResult -> o
@@ -78210,7 +78534,7 @@
     29:29:void com.android.tools.r8.ir.synthetic.SyntheticSourceCode.add(java.util.function.Consumer):77:77 -> i
     29:29:void prepareInstructions():215 -> i
     1:27:boolean checkSignatures():147:173 -> j
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.Hl:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.Ml:
     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
@@ -78226,12 +78550,12 @@
     5:5:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode build(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Position):91:91 -> a
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTargetReceiver(com.android.tools.r8.graph.DexType):61:61 -> b
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTarget(com.android.tools.r8.graph.DexMethod):66:66 -> b
-com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordEqualsCfCodeProvider -> com.android.tools.r8.internal.qS:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordEqualsCfCodeProvider -> com.android.tools.r8.internal.LS:
     com.android.tools.r8.graph.DexMethod getFieldsAsObjects -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):144:145 -> <init>
     1:18:com.android.tools.r8.graph.CfCode generateCfCode():162:179 -> b
     19:33:com.android.tools.r8.graph.CfCode generateCfCode():175:189 -> b
-com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.rS:
+com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider -> com.android.tools.r8.internal.MS:
     com.android.tools.r8.graph.DexField[] fields -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField[]):67:68 -> <init>
     1:2:void registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):55:56 -> a
@@ -78249,18 +78573,18 @@
     4:12:com.android.tools.r8.graph.CfCode generateCfCode():79 -> b
     13:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.synthetic.RecordCfCodeProvider$RecordGetFieldsAsObjectsCfCodeProvider.generateCfCodeWithArray():84:101 -> b
     13:30:com.android.tools.r8.graph.CfCode generateCfCode():80 -> b
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.r00:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.M00:
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> d
     1:2:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):15:16 -> <init>
     java.util.function.Consumer getRegistryCallback(com.android.tools.r8.graph.DexClassAndMethod) -> a
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():21:21 -> z0
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.u00:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.P00:
     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):18:20 -> <init>
     1:1:com.android.tools.r8.graph.DexType getHolder():24:24 -> a
     2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):30:30 -> a
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.F00:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.a10:
     com.android.tools.r8.ir.code.Position position -> h
     java.util.function.Predicate endsBlock -> j
     java.util.List constructors -> f
@@ -78346,7 +78670,7 @@
     25:25:void com.android.tools.r8.ir.synthetic.apiconverter.APIConversionCfCodeProvider.generateReturn(java.util.List):107:107 -> b
     25:25:com.android.tools.r8.graph.CfCode generateCfCode():98 -> b
     26:26:com.android.tools.r8.graph.CfCode generateCfCode():99:99 -> b
-com.android.tools.r8.ir.synthetic.apiconverter.EqualsCfCodeProvider -> com.android.tools.r8.internal.Hj:
+com.android.tools.r8.ir.synthetic.apiconverter.EqualsCfCodeProvider -> com.android.tools.r8.internal.Mj:
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):38:39 -> <init>
     1:5:com.android.tools.r8.graph.CfCode generateCfCode():46:50 -> b
@@ -78369,7 +78693,7 @@
     57:57:com.android.tools.r8.graph.CfCode generateCfCode():80:80 -> b
     58:71:com.android.tools.r8.graph.CfCode generateCfCode():71:84 -> b
     72:75:com.android.tools.r8.graph.CfCode generateCfCode():83:86 -> b
-com.android.tools.r8.ir.synthetic.apiconverter.HashCodeCfCodeProvider -> com.android.tools.r8.internal.qn:
+com.android.tools.r8.ir.synthetic.apiconverter.HashCodeCfCodeProvider -> com.android.tools.r8.internal.vn:
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):27:28 -> <init>
     1:3:com.android.tools.r8.graph.CfCode generateCfCode():33:35 -> b
@@ -78377,16 +78701,16 @@
     4:4:com.android.tools.r8.graph.CfCode generateCfCode():35 -> b
     5:8:com.android.tools.r8.graph.CfCode generateCfCode():35:38 -> b
     9:13:com.android.tools.r8.graph.CfCode generateCfCode():36:40 -> b
-com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider -> com.android.tools.r8.internal.SJ:
+com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider -> com.android.tools.r8.internal.ZJ:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):52:52 -> <init>
     1:6:void generateNullCheck(java.util.List):56:61 -> b
-com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$ArrayConversionCfCodeProvider -> com.android.tools.r8.internal.OJ:
+com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$ArrayConversionCfCodeProvider -> com.android.tools.r8.internal.VJ:
     com.android.tools.r8.graph.DexType convertedTypeArray -> d
     com.android.tools.r8.graph.DexType typeArray -> c
     com.android.tools.r8.graph.DexMethod conversion -> e
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):76:79 -> <init>
     1:54:com.android.tools.r8.graph.CfCode generateCfCode():84:137 -> b
-com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$CollectionConversionCfCodeProvider -> com.android.tools.r8.internal.PJ:
+com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$CollectionConversionCfCodeProvider -> com.android.tools.r8.internal.WJ:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexType collectionType -> c
     com.android.tools.r8.graph.DexMethod conversion -> d
@@ -78412,7 +78736,7 @@
     110:124:com.android.tools.r8.graph.CfCode generateCfCode():332:346 -> b
     125:125:com.android.tools.r8.graph.CfCode generateCfCode():344:344 -> b
     126:142:com.android.tools.r8.graph.CfCode generateCfCode():341:357 -> b
-com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$EnumConversionCfCodeProvider -> com.android.tools.r8.internal.QJ:
+com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$EnumConversionCfCodeProvider -> com.android.tools.r8.internal.XJ:
     com.android.tools.r8.graph.DexType enumType -> d
     java.lang.Iterable enumFields -> c
     com.android.tools.r8.graph.DexType convertedType -> e
@@ -78420,7 +78744,7 @@
     1:18:com.android.tools.r8.graph.CfCode generateCfCode():161:178 -> b
     19:25:com.android.tools.r8.graph.CfCode generateCfCode():177:183 -> b
     26:35:com.android.tools.r8.graph.CfCode generateCfCode():181:190 -> b
-com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$WrapperConversionCfCodeProvider -> com.android.tools.r8.internal.RJ:
+com.android.tools.r8.ir.synthetic.apiconverter.NullableConversionCfCodeProvider$WrapperConversionCfCodeProvider -> com.android.tools.r8.internal.YJ:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.graph.DexField wrapperField -> d
     com.android.tools.r8.graph.DexField reverseWrapperField -> c
@@ -78438,7 +78762,7 @@
     31:39:com.android.tools.r8.graph.CfCode generateCfCode():232:240 -> b
     40:40:com.android.tools.r8.graph.CfCode generateCfCode():238:238 -> b
     41:50:com.android.tools.r8.graph.CfCode generateCfCode():235:244 -> b
-com.android.tools.r8.ir.synthetic.apiconverter.WrapperConstructorCfCodeProvider -> com.android.tools.r8.internal.x50:
+com.android.tools.r8.ir.synthetic.apiconverter.WrapperConstructorCfCodeProvider -> com.android.tools.r8.internal.T50:
     com.android.tools.r8.graph.DexType superType -> d
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType):30:32 -> <init>
@@ -78461,12 +78785,12 @@
     64:64:void ensureFromTo(int,int,int):55:55 -> a
     65:65:void ensureFromTo(int,int,int):55:55 -> a
     59:59:void ensureFromTo(int,int,int):55:55 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.em:
+com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.jm:
 # {"id":"sourceFile","fileName":"Function.java"}
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.bn:
+com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.gn:
     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.sn:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.xn:
     int long2int(long) -> a
     int mix(int) -> a
     1:2:int arraySize(int,float):228:229 -> a
@@ -78517,7 +78841,7 @@
     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.t5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet -> com.android.tools.r8.internal.v5:
     boolean[] a -> b
     int size -> c
     1:4:void <init>(boolean[],int):104:107 -> <init>
@@ -78556,20 +78880,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.s5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet$1 -> com.android.tools.r8.internal.u5:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet this$0 -> c
     int next -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArraySet):119:120 -> <init>
     1:3:boolean nextBoolean():129:129 -> g
     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.u5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanArrays -> com.android.tools.r8.internal.w5:
     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.w5:
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.z5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection -> com.android.tools.r8.internal.y5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections -> com.android.tools.r8.internal.B5:
     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.x5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$EmptyCollection -> com.android.tools.r8.internal.z5:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     boolean contains(boolean) -> b
@@ -78580,7 +78904,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.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.y5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollections$UnmodifiableCollection -> com.android.tools.r8.internal.A5:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection collection -> b
     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
@@ -78604,17 +78928,17 @@
     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.B5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator -> com.android.tools.r8.internal.D5:
     boolean nextBoolean() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.F5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators -> com.android.tools.r8.internal.H5:
     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.C5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$EmptyIterator -> com.android.tools.r8.internal.E5:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:boolean nextBoolean():57:57 -> g
     1:1:boolean previousBoolean():62:62 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.D5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$SingletonIterator -> com.android.tools.r8.internal.F5:
     boolean element -> b
     int curr -> c
     1:2:void <init>(boolean):110:111 -> <init>
@@ -78624,21 +78948,21 @@
     1:4:boolean previousBoolean():133:133 -> j
     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.E5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterators$UnmodifiableIterator -> com.android.tools.r8.internal.G5:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator i -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator):724:725 -> <init>
     1:1:boolean nextBoolean():735:735 -> g
     1:1:boolean hasNext():730:730 -> hasNext
-com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.L5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets -> com.android.tools.r8.internal.N5:
     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.J5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$EmptySet -> com.android.tools.r8.internal.L5:
     1:1:void <init>():42:42 -> <init>
     1:1:boolean rem(boolean):64:64 -> 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.K5:
+com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanSets$Singleton -> com.android.tools.r8.internal.M5:
     boolean element -> b
     1:2:void <init>(boolean):89:90 -> <init>
     1:1:boolean addAll(java.util.Collection):115:115 -> addAll
@@ -78671,15 +78995,15 @@
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.util.Set entrySet():43:43 -> entrySet
     1:4:boolean equals(java.lang.Object):334:337 -> equals
-    1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.defaultReturnValue():60:60 -> g
-    1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.defaultReturnValue():0 -> g
-      # {"id":"com.android.tools.r8.synthesized"}
     1:2:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):120:121 -> get
     1:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):41 -> get
     1:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):0 -> get
       # {"id":"com.android.tools.r8.synthesized"}
+    1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.defaultReturnValue():60:60 -> h
+    1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.defaultReturnValue():0 -> h
+      # {"id":"com.android.tools.r8.synthesized"}
     1:4:int hashCode():324:327 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():311:311 -> k
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():311:311 -> l
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.put(java.lang.Object,java.lang.Object):0 -> put
       # {"id":"com.android.tools.r8.synthesized"}
@@ -78739,12 +79063,12 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.headMap(int):1010:1010 -> headMap
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.headMap(java.lang.Integer):46 -> headMap
     3:3:java.util.SortedMap headMap(java.lang.Object):30 -> headMap
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.entrySet():293:293 -> k
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> k
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.int2IntEntrySet():1431:1432 -> k
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.int2IntEntrySet():87 -> k
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.entrySet():293 -> k
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> k
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.entrySet():293:293 -> l
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> l
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.int2IntEntrySet():1431:1432 -> l
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.int2IntEntrySet():87 -> l
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.entrySet():293 -> l
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> l
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntSortedMap.lastKey():98:98 -> lastKey
     1:1:java.lang.Object lastKey():30 -> lastKey
     2:3:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.lastIntKey():989:990 -> lastKey
@@ -78783,7 +79107,7 @@
     boolean containsKey(int) -> a
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:4:boolean equals(java.lang.Object):296:299 -> equals
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> h
     1:4:int hashCode():286:289 -> hashCode
     1:13:void putAll(java.util.Map):70:82 -> putAll
     14:16:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectFunction.put(java.lang.Integer,java.lang.Object):135:137 -> putAll
@@ -78809,8 +79133,8 @@
     1:1:java.util.Set entrySet():30 -> entrySet
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap.firstKey():85:85 -> firstKey
     1:1:java.lang.Object firstKey():30 -> firstKey
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap.entrySet():293:293 -> g
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap.entrySet():293:293 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):30:30 -> headMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ObjectSortedMap.headMap(java.lang.Integer):46:46 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):30 -> headMap
@@ -78851,7 +79175,7 @@
     boolean containsKey(int) -> a
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:4:boolean equals(java.lang.Object):296:299 -> equals
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> h
     1:4:int hashCode():286:289 -> hashCode
     1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.keySet():37:37 -> keySet
     1:13:void putAll(java.util.Map):70:82 -> putAll
@@ -78881,8 +79205,8 @@
     1:1:java.lang.Integer firstKey():85:85 -> firstKey
     2:2:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.firstKey():85:85 -> firstKey
     2:2:java.lang.Object firstKey():30 -> firstKey
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.entrySet():293:293 -> g
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.entrySet():293:293 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):30:30 -> headMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.headMap(java.lang.Integer):46:46 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):30 -> headMap
@@ -79139,7 +79463,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):22:22 -> tailSet
     2:2: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:68 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):22 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.ur:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.zr:
     int[] key -> c
     int[] value -> d
     int size -> e
@@ -79167,19 +79491,19 @@
     2:3:boolean containsValue(int):266:267 -> d
     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.Int2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.int2IntEntrySet():230:230 -> j
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():37 -> j
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.int2IntEntrySet():230:230 -> k
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():37 -> k
     1:1:java.util.Set keySet():37:37 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():316:316 -> keySet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321:321 -> l
-    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 -> l
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321 -> l
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321:321 -> m
+    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 -> m
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321 -> m
     1:3:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.findKey(int):234:236 -> remove
     1:3:int remove(int):304 -> remove
     4:9:int remove(int):305:310 -> remove
     1:1:int size():251:251 -> size
     1:1:java.util.Collection values():37:37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.tr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.yr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap this$0 -> b
     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>
@@ -79189,7 +79513,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.sr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.xr:
     int curr -> b
     int next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet this$1 -> d
@@ -79198,10 +79522,10 @@
     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.vr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.Ar:
     boolean containsKey(int) -> a
     int put(int,int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Er:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Kr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> n
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
@@ -79247,8 +79571,8 @@
     1:1:int hashCode():1828 -> hashCode
     2:10:int hashCode():1829:1837 -> hashCode
     1:1:boolean isEmpty():781:781 -> isEmpty
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.int2IntEntrySet():1431:1432 -> j
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():87 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.int2IntEntrySet():1431:1432 -> k
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():87 -> k
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.keySet():1564:1565 -> keySet
     1:2:java.util.Set keySet():87 -> keySet
     1:1:void putAll(java.util.Map):295:295 -> putAll
@@ -79257,9 +79581,19 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.size():776:776 -> putAll
     4:4:void putAll(java.util.Map):297 -> putAll
     5:5:void putAll(java.util.Map):297:297 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.tryCapacity(long):271:272 -> putAll
-    6:7:void putAll(java.util.Map):297 -> putAll
-    8:8:void putAll(java.util.Map):300:300 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    6:6:void putAll(java.util.Map):297 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    10:10:void putAll(java.util.Map):297 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    11:11:void putAll(java.util.Map):297 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    12:12:void putAll(java.util.Map):297 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.tryCapacity(long):272:272 -> putAll
+    8:8:void putAll(java.util.Map):297 -> putAll
+    9:9:void putAll(java.util.Map):300:300 -> putAll
     1:1:int remove(int):429:429 -> remove
     2:6:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.removeNullEntry():285:289 -> remove
     2:6:int remove(int):429 -> remove
@@ -79267,14 +79601,20 @@
     1:1:int size():776:776 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.values():1629:1650 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.wr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$$ExternalSyntheticOutline0 -> com.android.tools.r8.internal.Br:
+# {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
+# {"id":"com.android.tools.r8.synthesized"}
+    1:3:long com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$$InternalSyntheticOutline$166$3f5cfa6510a38ef377d6f8c6a1c3c9f60eb5e7bf196cce29ad5ef811b9aa0737$0.m(long,long,long):0:2 -> a
+      # {"id":"com.android.tools.r8.synthesized"}
+      # {"id":"com.android.tools.r8.outline"}
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Cr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1629:1629 -> <init>
     1:1:void clear():1647:1647 -> clear
     1:1:boolean contains(int):1642:1642 -> f
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1632:1632 -> iterator
     1:1:int size():1637:1637 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.xr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Dr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1229:1229 -> <init>
@@ -79289,7 +79629,7 @@
     1:1:void set(java.lang.Object):1226:1226 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry):1218:1218 -> set
     2:2:void set(java.lang.Object):1226 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.yr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Er:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1482:1483 -> <init>
     1:1:void add(java.lang.Object):1444:1444 -> add
@@ -79304,7 +79644,7 @@
     1:1:void set(java.lang.Object):1444:1444 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeyIterator.set(java.lang.Integer):1473:1473 -> set
     2:2:void set(java.lang.Object):1444 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.zr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Fr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1498:1498 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1):1498:1498 -> <init>
@@ -79323,7 +79663,7 @@
     3:3:java.util.Iterator iterator():1498 -> iterator
     1:3:int lastInt():1537:1537 -> p
     1:1:int size():1509:1509 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Ar:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Gr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,int):820:821 -> <init>
@@ -79344,7 +79684,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntry.setValue(java.lang.Integer):877:877 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):815 -> setValue
     1:1:java.lang.String toString():895:895 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Br:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Hr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1276:1276 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$1):1276:1276 -> <init>
@@ -79366,7 +79706,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1276:1276 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry):1298:1298 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1276 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Cr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Ir:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -79384,7 +79724,7 @@
     1:2:int previousIndex():1130:1131 -> previousIndex
     1:46:void remove():1153:1198 -> remove
     47:47:void remove():1154:1154 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Dr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Jr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap):1611:1612 -> <init>
     1:1:void add(java.lang.Object):1577:1577 -> add
@@ -79399,12 +79739,12 @@
     1:1:void set(java.lang.Object):1577:1577 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap$ValueIterator.set(java.lang.Integer):1592:1592 -> set
     2:2:void set(java.lang.Object):1577 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.internal.Hr:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet() -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.Fr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.internal.Nr:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet() -> k
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.Lr:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.Gr:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Qr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.Mr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Wr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet entries -> j
     int[] key -> c
@@ -79450,8 +79790,8 @@
     1:1:int hashCode():1043 -> hashCode
     2:10:int hashCode():1044:1052 -> hashCode
     1:1:boolean isEmpty():433:433 -> isEmpty
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.int2IntEntrySet():773:774 -> j
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.int2IntEntrySet():773:774 -> k
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> k
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.keySet():834:835 -> keySet
     1:2:java.util.Set keySet():50 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
@@ -79460,9 +79800,19 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.size():428:428 -> putAll
     4:4:void putAll(java.util.Map):239 -> putAll
     5:5:void putAll(java.util.Map):239:239 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.tryCapacity(long):215:216 -> putAll
-    6:7:void putAll(java.util.Map):239 -> putAll
-    8:8:void putAll(java.util.Map):242:242 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.tryCapacity(long):215:215 -> putAll
+    6:6:void putAll(java.util.Map):239 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.tryCapacity(long):215:215 -> putAll
+    10:10:void putAll(java.util.Map):239 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.tryCapacity(long):215:215 -> putAll
+    11:11:void putAll(java.util.Map):239 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.tryCapacity(long):215:215 -> putAll
+    12:12:void putAll(java.util.Map):239 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.tryCapacity(long):216:216 -> putAll
+    8:8:void putAll(java.util.Map):239 -> putAll
+    9:9:void putAll(java.util.Map):242:242 -> putAll
     1:1:int remove(int):352:352 -> remove
     2:5:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.removeNullEntry():228:231 -> remove
     2:5:int remove(int):352 -> remove
@@ -79470,14 +79820,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.Ir:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.Or:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     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 -> f
     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.Jr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Pr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):664:664 -> <init>
@@ -79485,13 +79835,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.Kr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Qr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):787:788 -> <init>
     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
     1:1:int nextInt():793:793 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Lr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Rr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     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>
@@ -79500,7 +79850,7 @@
     1:3:boolean remove(int):821:823 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Mr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Sr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):472:473 -> <init>
@@ -79521,7 +79871,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.Nr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Tr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     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>
@@ -79530,7 +79880,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.Or:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Ur:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNullKey -> e
@@ -79549,14 +79899,14 @@
     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.Pr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Vr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):848:849 -> <init>
     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
     1:1:int nextInt():854:854 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Rr:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap -> com.android.tools.r8.internal.ks:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Xr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap -> com.android.tools.r8.internal.qs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry -> e
     java.util.Comparator storedComparator -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry tree -> c
@@ -79676,19 +80026,19 @@
     6:8:int lastIntKey():1007:1007 -> d
     1:2:java.lang.Object get(int):995:996 -> get
     1:1:boolean isEmpty():990:990 -> isEmpty
-    1:1:void allocatePaths():278:278 -> k
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1334:1335 -> keySet
-    1:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1948:1961 -> l
-    15:16:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):851:852 -> l
-    15:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1961 -> l
-    17:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1963:1968 -> l
-    23:24:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):851:852 -> l
-    23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1969 -> l
-    25:49:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1970:1994 -> l
-    50:51:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.right(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):862:863 -> l
-    50:51:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1995 -> l
-    52:52:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1950:1950 -> l
-    1:3:void setActualComparator():101:101 -> m
+    1:1:void allocatePaths():278:278 -> l
+    1:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1948:1961 -> m
+    15:16:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):851:852 -> m
+    15:16:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1961 -> m
+    17:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1963:1968 -> m
+    23:24:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.left(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):851:852 -> m
+    23:24:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1969 -> m
+    25:49:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1970:1994 -> m
+    50:51:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.right(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry):862:863 -> m
+    50:51:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1995 -> m
+    52:52:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap clone():1950:1950 -> m
+    1:3:void setActualComparator():101:101 -> n
     1:17:java.lang.Object remove(int):484:500 -> remove
     18:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.next():902:904 -> remove
     18:20:java.lang.Object remove(int):500 -> remove
@@ -79733,13 +80083,13 @@
     208:208:java.lang.Object remove(int):497:497 -> remove
     1:1:int size():985:985 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1384:1401 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$1 -> com.android.tools.r8.internal.Sr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$1 -> com.android.tools.r8.internal.Yr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):102:102 -> <init>
     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.Int2ObjectAVLTreeMap$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.Int2ObjectAVLTreeMap$2 -> com.android.tools.r8.internal.Ur:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2 -> com.android.tools.r8.internal.as:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap this$0 -> c
     java.util.Comparator comparator -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):1161:1162 -> <init>
@@ -79762,7 +80112,7 @@
     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.Int2ObjectAVLTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1236:1236 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1161 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2$1 -> com.android.tools.r8.internal.Tr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2$1 -> com.android.tools.r8.internal.Zr:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2 this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2):1162:1162 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1162:1162 -> compare
@@ -79775,14 +80125,14 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$1.compare(int,int):104:104 -> compare
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1164 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):1162 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$3 -> com.android.tools.r8.internal.Vr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$3 -> com.android.tools.r8.internal.bs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):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.Int2ObjectAVLTreeMap$Entry -> com.android.tools.r8.internal.Wr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry -> com.android.tools.r8.internal.cs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry left -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry right -> e
     int info -> f
@@ -79803,7 +80153,7 @@
     1:1:int hashCode():953:953 -> hashCode
     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.Int2ObjectAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.Xr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.ds:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):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.Int2ObjectAVLTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1155:1155 -> add
@@ -79815,7 +80165,7 @@
     1:1:void set(java.lang.Object):1130:1130 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1150:1150 -> set
     2:2:void set(java.lang.Object):1130 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.Yr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.es:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):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.Int2ObjectAVLTreeMap$KeyIterator.add(java.lang.Integer):1301:1301 -> add
@@ -79829,12 +80179,12 @@
     1:1:void set(java.lang.Object):1252:1252 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$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.Int2ObjectAVLTreeMap$KeySet -> com.android.tools.r8.internal.Zr:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$KeySet -> com.android.tools.r8.internal.fs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):1308:1308 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$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.Int2ObjectAVLTreeMap$Submap -> com.android.tools.r8.internal.hs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap -> com.android.tools.r8.internal.ns:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap this$0 -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     boolean bottom -> e
@@ -79882,34 +80232,34 @@
     2:2:boolean isEmpty():1676 -> isEmpty
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1778:1778 -> isEmpty
     3:3:boolean isEmpty():1676 -> isEmpty
-    1:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1712:1718 -> k
-    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.locateKey(int):264:264 -> k
-    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1718 -> k
-    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.left():767:767 -> k
-    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.locateKey(int):266 -> k
-    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1718 -> k
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.right():777:777 -> k
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.locateKey(int):266 -> k
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1718 -> k
-    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1720:1720 -> k
-    12:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.next():902:904 -> k
-    12:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1720 -> k
-    15:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1724:1724 -> k
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1592:1593 -> keySet
-    1:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1735:1741 -> l
+    1:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1712:1718 -> l
     8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.locateKey(int):264:264 -> l
-    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1741 -> l
+    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1718 -> l
     9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.left():767:767 -> l
     9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.locateKey(int):266 -> l
-    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1741 -> l
+    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1718 -> l
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.right():777:777 -> l
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.locateKey(int):266 -> l
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1741 -> l
-    11:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1743:1747 -> l
+    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1718 -> l
+    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1720:1720 -> l
+    12:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.next():902:904 -> l
+    12:14:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1720 -> l
+    15:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry firstEntry():1724:1724 -> l
+    1:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1735:1741 -> m
+    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.locateKey(int):264:264 -> m
+    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1741 -> m
+    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.left():767:767 -> m
+    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.locateKey(int):266 -> m
+    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1741 -> m
+    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry.right():777:777 -> m
+    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap.locateKey(int):266 -> m
+    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1741 -> m
+    11:15:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry lastEntry():1743:1747 -> m
     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.ObjectCollection values():1598:1618 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.as:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.gs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1497:1497 -> <init>
     1:1:void clear():1549:1549 -> clear
@@ -79942,19 +80292,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.Int2ObjectAVLTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1574:1574 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1497 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.bs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.hs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$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.Int2ObjectAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.cs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.is:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap this$1 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1580:1580 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$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.Int2ObjectAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.ds:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.js:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$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.Int2ObjectAVLTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1832:1832 -> add
@@ -79966,7 +80316,7 @@
     1:1:void set(java.lang.Object):1807:1807 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1827:1827 -> set
     2:2:void set(java.lang.Object):1807 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.es:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.ks:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1777:1778 -> <init>
     1:1:void updateNext():1802:1802 -> l
@@ -79977,7 +80327,7 @@
     3:4:void updateNext():1802 -> l
     5:6:void updateNext():1802:1803 -> l
     1:2:void updatePrevious():1797:1798 -> m
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.fs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.ls:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$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.Int2ObjectAVLTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1896:1896 -> add
@@ -79991,14 +80341,14 @@
     1:1:void set(java.lang.Object):1846:1846 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$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.Int2ObjectAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.gs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.ms:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap):1910:1910 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$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.Int2ObjectAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.is:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.os:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry curr -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry prev -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$Entry next -> c
@@ -80021,14 +80371,14 @@
     1:1:int nextIndex():1088:1088 -> nextIndex
     1:1:int previousIndex():1092:1092 -> previousIndex
     1:12:void remove():1096:1096 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.js:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.ps:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap):1348:1348 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$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.Int2ObjectArrayMap -> com.android.tools.r8.internal.ns:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap -> com.android.tools.r8.internal.ts:
     java.lang.Object[] value -> d
     int[] key -> c
     int size -> e
@@ -80064,7 +80414,7 @@
     4:10:java.lang.Object remove(int):309:315 -> remove
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():326:326 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet -> com.android.tools.r8.internal.ms:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet -> com.android.tools.r8.internal.ss:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$1):133:133 -> <init>
@@ -80074,7 +80424,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.Int2ObjectArrayMap$EntrySet$1 -> com.android.tools.r8.internal.ls:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet$1 -> com.android.tools.r8.internal.rs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -80083,18 +80433,18 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap$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.Int2ObjectFunction -> com.android.tools.r8.internal.os:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunction -> com.android.tools.r8.internal.us:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap -> com.android.tools.r8.internal.rs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap -> com.android.tools.r8.internal.xs:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ObjectEntrySet() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.ps:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry -> com.android.tools.r8.internal.vs:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet -> com.android.tools.r8.internal.qs:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps -> com.android.tools.r8.internal.ts:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$FastEntrySet -> com.android.tools.r8.internal.ws:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps -> com.android.tools.r8.internal.zs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps$EmptyMap EMPTY_MAP -> a
     1:1:void <clinit>():123:123 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps$EmptyMap -> com.android.tools.r8.internal.ss:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps$EmptyMap -> com.android.tools.r8.internal.ys:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunctions$EmptyFunction.<init>():41:41 -> <init>
     1:1:void <init>():45 -> <init>
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunctions$EmptyFunction.containsKey(int) -> a
@@ -80105,9 +80455,9 @@
     1:1:java.lang.Object clone():94:94 -> clone
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:2:boolean equals(java.lang.Object):109:110 -> equals
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():74:74 -> g
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectFunctions$EmptyFunction.get(int) -> get
       # {"id":"com.android.tools.r8.synthesized"}
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():74:74 -> h
     1:1:java.util.Set keySet():42:42 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():79:79 -> keySet
     1:1:void putAll(java.util.Map):55:55 -> putAll
@@ -80117,7 +80467,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():85:85 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMaps$EmptyMap.values():85:85 -> values
     2:2:java.util.Collection values():42 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.Cs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap -> com.android.tools.r8.internal.Is:
     java.lang.Object[] value -> d
     int[] key -> c
     int maxFill -> h
@@ -80172,23 +80522,33 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.size():386:386 -> putAll
     4:4:void putAll(java.util.Map):240 -> putAll
     5:5:void putAll(java.util.Map):240:240 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.tryCapacity(long):214:215 -> putAll
-    6:7:void putAll(java.util.Map):240 -> putAll
-    8:8:void putAll(java.util.Map):243:243 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.tryCapacity(long):214:214 -> putAll
+    6:6:void putAll(java.util.Map):240 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.tryCapacity(long):214:214 -> putAll
+    10:10:void putAll(java.util.Map):240 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.tryCapacity(long):214:214 -> putAll
+    11:11:void putAll(java.util.Map):240 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.tryCapacity(long):214:214 -> putAll
+    12:12:void putAll(java.util.Map):240 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.tryCapacity(long):215:215 -> putAll
+    8:8:void putAll(java.util.Map):240 -> putAll
+    9:9:void putAll(java.util.Map):243:243 -> putAll
     1:1:java.lang.Object remove(int):309:309 -> remove
     2:6:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap.removeNullEntry():228:232 -> remove
     2:6:java.lang.Object remove(int):309 -> remove
     7:17:java.lang.Object remove(int):310:320 -> remove
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():794:815 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.us:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1 -> com.android.tools.r8.internal.As:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):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.Int2ObjectOpenHashMap$EntryIterator -> com.android.tools.r8.internal.vs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Bs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):600:600 -> <init>
@@ -80196,13 +80556,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$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.Int2ObjectOpenHashMap$KeyIterator -> com.android.tools.r8.internal.ws:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Cs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):721:722 -> <init>
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
     1:1:int nextInt():727:727 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.xs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$KeySet -> com.android.tools.r8.internal.Ds:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):737:737 -> <init>
@@ -80211,7 +80571,7 @@
     1:3:boolean remove(int):755:757 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.ys:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntry -> com.android.tools.r8.internal.Es:
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,int):430:431 -> <init>
@@ -80223,7 +80583,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.Int2ObjectOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.zs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Fs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$1):625:625 -> <init>
@@ -80232,7 +80592,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.Int2ObjectOpenHashMap$MapIterator -> com.android.tools.r8.internal.As:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$MapIterator -> com.android.tools.r8.internal.Gs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNullKey -> e
     int c -> d
@@ -80251,11 +80611,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.Int2ObjectOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Bs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Hs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap -> com.android.tools.r8.internal.Us:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap -> com.android.tools.r8.internal.at:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     boolean modified -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry tree -> c
@@ -80344,8 +80704,8 @@
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry locateKey(int):268 -> e
     1:2:java.lang.Object get(int):961:962 -> get
     1:1:boolean isEmpty():956:956 -> isEmpty
-    1:2:void allocatePaths():282:283 -> k
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1298:1299 -> keySet
+    1:2:void allocatePaths():282:283 -> l
     1:8:java.lang.Object remove(int):449:456 -> remove
     9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap.compare(int,int):234:234 -> remove
     9:9:java.lang.Object remove(int):456 -> remove
@@ -80373,7 +80733,7 @@
     262:263:java.lang.Object remove(int):472:473 -> remove
     1:1:int size():951:951 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values():1348:1369 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.Es:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.Ks:
     java.util.Comparator comparator -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1127:1128 -> <init>
@@ -80396,20 +80756,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.Int2ObjectRBTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1202:1202 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1127 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2$1 -> com.android.tools.r8.internal.Ds:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2$1 -> com.android.tools.r8.internal.Js:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$2 this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$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.Int2ObjectRBTreeMap$3 -> com.android.tools.r8.internal.Fs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$3 -> com.android.tools.r8.internal.Ls:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):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.Int2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.Gs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.Ms:
     int info -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry left -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry right -> e
@@ -80430,7 +80790,7 @@
     1:1:int hashCode():919:919 -> hashCode
     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.Int2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.Hs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.Ns:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):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.Int2ObjectRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1121:1121 -> add
@@ -80442,7 +80802,7 @@
     1:1:void set(java.lang.Object):1096:1096 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1116:1116 -> set
     2:2:void set(java.lang.Object):1096 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.Is:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.Os:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):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.Int2ObjectRBTreeMap$KeyIterator.add(java.lang.Integer):1267:1267 -> add
@@ -80456,12 +80816,12 @@
     1:1:void set(java.lang.Object):1218:1218 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.Js:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.Ps:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1274:1274 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.Rs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.Xs:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     boolean bottom -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> i
@@ -80508,16 +80868,16 @@
     2:2:boolean isEmpty():1641 -> isEmpty
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1743:1743 -> isEmpty
     3:3:boolean isEmpty():1641 -> isEmpty
-    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry firstEntry():1677:1685 -> k
-    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry.next():868:870 -> k
-    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry firstEntry():1685 -> k
-    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry firstEntry():1689:1689 -> k
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1560:1561 -> keySet
-    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry lastEntry():1700:1712 -> l
+    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry firstEntry():1677:1685 -> l
+    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry.next():868:870 -> l
+    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry firstEntry():1685 -> l
+    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry firstEntry():1689:1689 -> l
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry lastEntry():1700:1712 -> m
     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.ObjectCollection values():1566:1583 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.Ks:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.Qs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1465:1465 -> <init>
     1:1:void clear():1517:1517 -> clear
@@ -80550,19 +80910,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.Int2ObjectRBTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1542:1542 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.Ls:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.Rs:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Ms:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Ss:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1548:1548 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Ns:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Ts:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1797:1797 -> add
@@ -80574,7 +80934,7 @@
     1:1:void set(java.lang.Object):1772:1772 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry):1792:1792 -> set
     2:2:void set(java.lang.Object):1772 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Os:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Us:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1742:1743 -> <init>
     1:1:void updateNext():1767:1767 -> l
@@ -80585,7 +80945,7 @@
     3:4:void updateNext():1767 -> l
     5:6:void updateNext():1767:1768 -> l
     1:2:void updatePrevious():1762:1763 -> m
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Ps:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Vs:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1861:1861 -> add
@@ -80599,14 +80959,14 @@
     1:1:void set(java.lang.Object):1811:1811 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Qs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Ws:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap):1875:1875 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Ss:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Ys:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry curr -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$Entry prev -> b
@@ -80629,24 +80989,24 @@
     1:1:int nextIndex():1054:1054 -> nextIndex
     1:1:int previousIndex():1058:1058 -> previousIndex
     1:12:void remove():1062:1062 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Ts:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Zs:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap):1312:1312 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectRBTreeMap$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.Int2ObjectSortedMap -> com.android.tools.r8.internal.Vs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap -> com.android.tools.r8.internal.bt:
     int firstIntKey() -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ObjectEntrySet() -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap tailMap(int) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap headMap(int) -> c
     int lastIntKey() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps -> com.android.tools.r8.internal.Xs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps -> com.android.tools.r8.internal.dt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap EMPTY_MAP -> a
     1:1:void <clinit>():185:185 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.Ws:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.ct:
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap subMap(int,int):95:95 -> a
     2:2:int firstIntKey():112:112 -> a
@@ -80661,8 +81021,8 @@
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap.firstIntKey():112:112 -> firstKey
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap.firstKey():165 -> firstKey
     1:1:java.lang.Object firstKey():57 -> firstKey
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap.entrySet():84:84 -> g
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():57 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap.entrySet():84:84 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():57 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):57:57 -> headMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap.headMap(java.lang.Integer):129:129 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):57 -> headMap
@@ -80683,7 +81043,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMaps$EmptySortedMap.tailMap(java.lang.Integer):141:141 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):57 -> tailMap
     3:3:java.util.SortedMap tailMap(java.lang.Object):57:57 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.qt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.wt:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
@@ -80807,8 +81167,8 @@
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry locateKey(int):266 -> e
     1:2:java.lang.Object get(int):995:996 -> get
     1:1:boolean isEmpty():990:990 -> isEmpty
-    1:1:void allocatePaths():278:278 -> k
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1334:1335 -> keySet
+    1:1:void allocatePaths():278:278 -> l
     1:8:java.lang.Object remove(int):484:491 -> remove
     9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.compare(int,int):232:232 -> remove
     9:9:java.lang.Object remove(int):491 -> remove
@@ -80856,7 +81216,7 @@
     201:201:java.lang.Object remove(int):497: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$2 -> com.android.tools.r8.internal.Zs:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.ft:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> c
     java.util.Comparator comparator -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1161:1162 -> <init>
@@ -80879,20 +81239,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.Ys:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.et:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 this$1 -> b
     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.at:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.gt:
     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):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.bt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.ht:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left -> d
     int info -> f
@@ -80913,7 +81273,7 @@
     1:1:int hashCode():953:953 -> hashCode
     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.ct:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.jt:
     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
@@ -80925,7 +81285,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.dt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.kt:
     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
@@ -80939,12 +81299,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.et:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.lt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> c
     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.nt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.tt:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
@@ -80991,16 +81351,16 @@
     2:2:boolean isEmpty():1676 -> isEmpty
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1778:1778 -> isEmpty
     3:3:boolean isEmpty():1676 -> isEmpty
-    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1712:1720 -> k
-    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.next():902:904 -> k
-    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1720 -> k
-    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1724:1724 -> k
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1592:1593 -> keySet
-    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1735:1747 -> l
+    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1712:1720 -> l
+    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.next():902:904 -> l
+    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1720 -> l
+    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1724:1724 -> l
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1735:1747 -> m
     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.ft:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.mt:
     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):1497:1497 -> <init>
     1:1:void clear():1549:1549 -> clear
@@ -81033,19 +81393,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.gt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.nt:
     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):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.ht:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.ot:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> c
     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.jt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.pt:
     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
@@ -81057,7 +81417,7 @@
     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.kt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.qt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1778 -> <init>
     1:1:void updateNext():1802:1802 -> l
@@ -81068,7 +81428,7 @@
     3:4:void updateNext():1802 -> l
     5:6:void updateNext():1802:1803 -> l
     1:2:void updatePrevious():1797:1798 -> m
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.lt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.rt:
     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
@@ -81082,14 +81442,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.mt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.st:
     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.ot:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.ut:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry curr -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry next -> c
@@ -81112,14 +81472,14 @@
     1:1:int nextIndex():1088:1088 -> nextIndex
     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.pt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.vt:
     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.tt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.zt:
     java.lang.Object[] value -> d
     int[] key -> c
     int size -> e
@@ -81155,7 +81515,7 @@
     4:10:java.lang.Object remove(int):309: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$EntrySet -> com.android.tools.r8.internal.st:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.yt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap this$0 -> b
     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>
@@ -81165,7 +81525,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.rt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.xt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -81174,10 +81534,10 @@
     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.ut:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.At:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.Dt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.Jt:
     java.lang.Object[] value -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keys -> n
     int size -> l
@@ -81239,23 +81599,33 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.size():727:727 -> putAll
     4:4:void putAll(java.util.Map):298 -> putAll
     5:5:void putAll(java.util.Map):298:298 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.tryCapacity(long):270:271 -> putAll
-    6:7:void putAll(java.util.Map):298 -> putAll
-    8:8:void putAll(java.util.Map):301:301 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.tryCapacity(long):270:270 -> putAll
+    6:6:void putAll(java.util.Map):298 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.tryCapacity(long):270:270 -> putAll
+    10:10:void putAll(java.util.Map):298 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.tryCapacity(long):270:270 -> putAll
+    11:11:void putAll(java.util.Map):298 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.tryCapacity(long):270:270 -> putAll
+    12:12:void putAll(java.util.Map):298 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    8:8:void putAll(java.util.Map):298 -> putAll
+    9:9:void putAll(java.util.Map):301:301 -> putAll
     1:1:java.lang.Object remove(int):377:377 -> remove
     2:7:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap.removeNullEntry():285:290 -> remove
     2:7:java.lang.Object remove(int):377 -> remove
     8:18:java.lang.Object remove(int):378:388 -> remove
     1:1:int size():727:727 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1532:1553 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.vt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Bt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1532:1532 -> <init>
     1:1:void clear():1550:1550 -> clear
     1:1:boolean contains(java.lang.Object):1545:1545 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1535:1535 -> iterator
     1:1:int size():1540:1540 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.wt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Ct:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1158:1158 -> <init>
@@ -81270,7 +81640,7 @@
     1:1:void set(java.lang.Object):1155:1155 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1147:1147 -> set
     2:2:void set(java.lang.Object):1155 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.xt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Dt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1409:1410 -> <init>
     1:1:void add(java.lang.Object):1371:1371 -> add
@@ -81285,7 +81655,7 @@
     1:1:void set(java.lang.Object):1371:1371 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeyIterator.set(java.lang.Integer):1400:1400 -> set
     2:2:void set(java.lang.Object):1371 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.yt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Et:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1425:1425 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1):1425:1425 -> <init>
@@ -81304,7 +81674,7 @@
     3:3:java.util.Iterator iterator():1425 -> iterator
     1:3:int lastInt():1464:1464 -> p
     1:1:int size():1436:1436 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.zt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Ft:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,int):771:772 -> <init>
@@ -81316,7 +81686,7 @@
     1:1:int hashCode():817:817 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):790:791 -> setValue
     1:1:java.lang.String toString():822:822 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.At:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Gt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1205:1205 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$1):1205:1205 -> <init>
@@ -81338,7 +81708,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1205:1205 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1227:1227 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1205 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Bt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Ht:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -81356,22 +81726,22 @@
     1:2:int previousIndex():1057:1058 -> previousIndex
     1:48:void remove():1080:1127 -> remove
     49:49:void remove():1081:1081 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Ct:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.It:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceLinkedOpenHashMap):1520:1521 -> <init>
     1:1:void add(java.lang.Object):1517:1517 -> add
     1:1:java.lang.Object next():1526:1526 -> next
     1:1:java.lang.Object previous():1507:1507 -> previous
     1:1:void set(java.lang.Object):1512:1512 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.Gt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.Mt:
     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.Et:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.Kt:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Ft:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.It:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Lt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.Ot:
     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.Ht:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.Nt:
     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
@@ -81382,9 +81752,9 @@
     1:1:java.lang.Object clone():95:95 -> clone
     1:1:java.util.Set entrySet():43:43 -> entrySet
     1:2:boolean equals(java.lang.Object):110:111 -> equals
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():75:75 -> g
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.get(int) -> get
       # {"id":"com.android.tools.r8.synthesized"}
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():75:75 -> h
     1:1:java.util.Set keySet():43:43 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():80:80 -> keySet
     1:1:void putAll(java.util.Map):56:56 -> putAll
@@ -81394,7 +81764,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.Rt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.Xt:
     java.lang.Object[] value -> d
     float f -> j
     int[] key -> c
@@ -81450,23 +81820,33 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.size():386:386 -> putAll
     4:4:void putAll(java.util.Map):240 -> putAll
     5:5:void putAll(java.util.Map):240:240 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.tryCapacity(long):214:215 -> putAll
-    6:7:void putAll(java.util.Map):240 -> putAll
-    8:8:void putAll(java.util.Map):243:243 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.tryCapacity(long):214:214 -> putAll
+    6:6:void putAll(java.util.Map):240 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.tryCapacity(long):214:214 -> putAll
+    10:10:void putAll(java.util.Map):240 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.tryCapacity(long):214:214 -> putAll
+    11:11:void putAll(java.util.Map):240 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.tryCapacity(long):214:214 -> putAll
+    12:12:void putAll(java.util.Map):240 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.tryCapacity(long):215:215 -> putAll
+    8:8:void putAll(java.util.Map):240 -> putAll
+    9:9:void putAll(java.util.Map):243:243 -> putAll
     1:1:java.lang.Object remove(int):309:309 -> remove
     2:6:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.removeNullEntry():228:232 -> remove
     2:6:java.lang.Object remove(int):309 -> remove
     7:17:java.lang.Object remove(int):310: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.Jt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.Pt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     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.Kt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Qt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):600:600 -> <init>
@@ -81474,13 +81854,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.Lt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Rt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):721:722 -> <init>
     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
     1:1:int nextInt():727:727 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.Mt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.St:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     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>
@@ -81489,7 +81869,7 @@
     1:3:boolean remove(int):755:757 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.Nt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.Tt:
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -81501,7 +81881,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.Ot:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Ut:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     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>
@@ -81510,7 +81890,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.Pt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.Vt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNullKey -> e
@@ -81529,11 +81909,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.Qt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Wt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     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.ju:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.pu:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry[] nodePath -> l
@@ -81621,8 +82001,8 @@
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry locateKey(int):268 -> e
     1:2:java.lang.Object get(int):961:962 -> get
     1:1:boolean isEmpty():956:956 -> isEmpty
-    1:2:void allocatePaths():282:283 -> k
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1298:1299 -> keySet
+    1:2:void allocatePaths():282:283 -> l
     1:8:java.lang.Object remove(int):449:456 -> remove
     9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> remove
     9:9:java.lang.Object remove(int):456 -> remove
@@ -81650,7 +82030,7 @@
     262:263:java.lang.Object remove(int):472: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$2 -> com.android.tools.r8.internal.Tt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.Zt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> c
     java.util.Comparator comparator -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1127:1128 -> <init>
@@ -81673,20 +82053,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.St:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.Yt:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 this$1 -> b
     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.Ut:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.au:
     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):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.Vt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.bu:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry left -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry right -> e
     int info -> f
@@ -81707,7 +82087,7 @@
     1:1:int hashCode():919:919 -> hashCode
     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.Wt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.cu:
     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
@@ -81719,7 +82099,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.Xt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.du:
     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
@@ -81733,12 +82113,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.Yt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.eu:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> c
     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.gu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.mu:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> j
@@ -81785,16 +82165,16 @@
     2:2:boolean isEmpty():1641 -> isEmpty
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1743:1743 -> isEmpty
     3:3:boolean isEmpty():1641 -> isEmpty
-    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1677:1685 -> k
-    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.next():868:870 -> k
-    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685 -> k
-    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1689:1689 -> k
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1560:1561 -> keySet
-    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1700:1712 -> l
+    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1677:1685 -> l
+    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry.next():868:870 -> l
+    10:12:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685 -> l
+    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1689:1689 -> l
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1700:1712 -> m
     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.Zt:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.fu:
     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):1465:1465 -> <init>
     1:1:void clear():1517:1517 -> clear
@@ -81827,19 +82207,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.au:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.gu:
     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):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.bu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.hu:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> c
     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.cu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.iu:
     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
@@ -81851,7 +82231,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.du:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.ju:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1742:1743 -> <init>
     1:1:void updateNext():1767:1767 -> l
@@ -81862,7 +82242,7 @@
     3:4:void updateNext():1767 -> l
     5:6:void updateNext():1767:1768 -> l
     1:2:void updatePrevious():1762:1763 -> m
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.eu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.ku:
     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
@@ -81876,14 +82256,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.fu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.lu:
     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.hu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.nu:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry prev -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry curr -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry next -> c
@@ -81906,14 +82286,14 @@
     1:1:int nextIndex():1054:1054 -> nextIndex
     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.iu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.ou:
     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.lu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.ru:
     int firstIntKey() -> a
     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
@@ -81923,11 +82303,11 @@
     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 lastIntKey() -> d
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.ku:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.nu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.qu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.tu:
     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.mu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.su:
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):95:95 -> a
     2:2:int firstIntKey():112:112 -> a
@@ -81943,7 +82323,7 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():84:84 -> entrySet
     1:1:java.lang.Object firstKey():57:57 -> firstKey
     2:2:java.lang.Integer firstKey():165:165 -> firstKey
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():57:57 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():57:57 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):57:57 -> headMap
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():57:57 -> keySet
     2:2:java.util.Set keySet():57:57 -> keySet
@@ -81952,7 +82332,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.ru:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.xu:
     int[] a -> b
     int size -> c
     1:2:void <init>(int[],boolean):70:71 -> <init>
@@ -82119,7 +82499,7 @@
     6:6:void grow(int):250:250 -> n
     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.qu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.wu:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -82133,7 +82513,7 @@
     1:3:int nextInt():506:506 -> nextInt
     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.tu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.zu:
     int[] a -> b
     int size -> c
     1:2:void <init>():55:56 -> <init>
@@ -82176,23 +82556,23 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet.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.ints.IntArraySet$1 -> com.android.tools.r8.internal.su:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.yu:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet this$0 -> c
     int next -> b
     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 -> nextInt
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.uu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.Au:
     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.vu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.Bu:
     int previousInt() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.xu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.Du:
     boolean contains(int) -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.Au:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.Gu:
     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.yu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.Eu:
     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
@@ -82203,7 +82583,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.zu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.Fu:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> b
     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
@@ -82228,9 +82608,9 @@
     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.Bu:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.Eu:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.Hu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.Hu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.Ku:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.Nu:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
     1:1:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312:312 -> a
@@ -82254,28 +82634,28 @@
     15:15:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
     9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators.unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[],int,int):288:288 -> a
     9:9:int unwrap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator,int[]):312 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.Fu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.Lu:
     1:1:void <init>():42:42 -> <init>
     1:1:int previousInt():62:62 -> c
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:int nextInt():57:57 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Gu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Mu:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> b
     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 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.Iu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.Ou:
     void getElements(int,int[],int,int) -> a
     void removeElements(int,int) -> a
     void add(int,int) -> b
     int getInt(int) -> b
     int set(int,int) -> c
     int removeInt(int) -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.Ju:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.Lu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.Pu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.Ru:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList EMPTY_LIST -> a
     1:1:void <clinit>():323:323 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.Ku:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.Qu:
     1:1:void <init>():65:65 -> <init>
     1:1:boolean add(java.lang.Integer):156:156 -> a
     2:3:void getElements(int,int[],int,int):263:264 -> a
@@ -82319,7 +82699,7 @@
     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
     1:1:java.lang.String toString():311:311 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.Su:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.Yu:
     int[] key -> b
     float f -> h
     int maxFill -> f
@@ -82337,9 +82717,19 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.size():412:412 -> a
     4:4:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):280 -> a
     5:5:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):280:280 -> a
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):271:272 -> a
-    6:7:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):280 -> a
-    8:8:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):283:283 -> a
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):271:271 -> a
+    6:6:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):280 -> a
+    7:7:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):271:271 -> a
+    10:10:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):280 -> a
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):271:271 -> a
+    11:11:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):280 -> a
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):271:271 -> a
+    12:12:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):280 -> a
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):272:272 -> a
+    8:8:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):280 -> a
+    9:9:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):283:283 -> a
     1:14:boolean add(int):302:315 -> add
     1:1:boolean addAll(java.util.Collection):289:289 -> addAll
     2:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.ensureCapacity(int):266:267 -> addAll
@@ -82347,9 +82737,19 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.size():412:412 -> addAll
     4:4:boolean addAll(java.util.Collection):292 -> addAll
     5:5:boolean addAll(java.util.Collection):292:292 -> addAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):271:272 -> addAll
-    6:7:boolean addAll(java.util.Collection):292 -> addAll
-    8:8:boolean addAll(java.util.Collection):295:295 -> addAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):271:271 -> addAll
+    6:6:boolean addAll(java.util.Collection):292 -> addAll
+    7:7:boolean addAll(java.util.Collection):0:0 -> addAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):271:271 -> addAll
+    10:10:boolean addAll(java.util.Collection):292 -> addAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):271:271 -> addAll
+    11:11:boolean addAll(java.util.Collection):292 -> addAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):271:271 -> addAll
+    12:12:boolean addAll(java.util.Collection):292 -> addAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.tryCapacity(long):272:272 -> addAll
+    8:8:boolean addAll(java.util.Collection):292 -> addAll
+    9:9:boolean addAll(java.util.Collection):295:295 -> addAll
     1:4:void clear():404:407 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.clone():672:677 -> clone
     1:6:java.lang.Object clone():40 -> clone
@@ -82376,7 +82776,7 @@
     9:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet.shiftKeys(int):339:343 -> k
     9:13:boolean removeEntry(int):349 -> k
     1:1:int size():412:412 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.Ru:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.Xu:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> f
     boolean mustReturnNull -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet this$0 -> g
@@ -82395,25 +82795,25 @@
     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.Tu:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.Vu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.Zu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.bv:
     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.Uu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.av:
     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 -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.Wu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.cv:
     int firstInt() -> K
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet tailSet(int) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet headSet(int) -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet subSet(int,int) -> d
     int lastInt() -> p
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.Yu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.ev:
     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.Xu:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.dv:
     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
@@ -82718,9 +83118,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.qE:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.rE:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.AE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.xE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.yE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.HE:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     java.lang.Object[] value -> c
     int size -> h
@@ -82775,20 +83175,30 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.size():386:386 -> putAll
     4:4:void putAll(java.util.Map):240 -> putAll
     5:5:void putAll(java.util.Map):240:240 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.tryCapacity(long):214:215 -> putAll
-    6:7:void putAll(java.util.Map):240 -> putAll
-    8:8:void putAll(java.util.Map):243:243 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.tryCapacity(long):214:214 -> putAll
+    6:6:void putAll(java.util.Map):240 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.tryCapacity(long):214:214 -> putAll
+    10:10:void putAll(java.util.Map):240 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.tryCapacity(long):214:214 -> putAll
+    11:11:void putAll(java.util.Map):240 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.tryCapacity(long):214:214 -> putAll
+    12:12:void putAll(java.util.Map):240 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.tryCapacity(long):215:215 -> putAll
+    8:8:void putAll(java.util.Map):240 -> putAll
+    9:9:void putAll(java.util.Map):243:243 -> putAll
     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.sE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.zE:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     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.tE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.AE:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry entry -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> i
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):600:600 -> <init>
@@ -82796,13 +83206,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.uE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.BE:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     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
     1:1:long nextLong():727:727 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.vE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.CE:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     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>
@@ -82810,7 +83220,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.wE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.DE:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -82821,7 +83231,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.xE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.EE:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     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>
@@ -82830,7 +83240,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.yE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.FE:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList wrapped -> f
@@ -82849,11 +83259,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.zE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.GE:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
     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.CE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.JE:
     long[] a -> b
     int size -> c
     1:3:void <init>(int):81:83 -> <init>
@@ -82941,7 +83351,7 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongListIterator listIterator(int):493:494 -> j
     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.BE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.IE:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -82955,17 +83365,17 @@
     1:3:long nextLong():506:506 -> nextLong
     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.DE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.KE:
     long previousLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.EE:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.HE:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.IE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.LE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.OE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.PE:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long set(int,long) -> b
     long getLong(int) -> c
     long removeLong(int) -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.OE:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.VE:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.internal.M0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -82982,11 +83392,11 @@
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap.entrySet():297:297 -> equals
     4:4:boolean equals(java.lang.Object):323 -> equals
     5:5:boolean equals(java.lang.Object):323:323 -> equals
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap.keySet() -> g
     1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.get(java.lang.Object):108:108 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.get(java.lang.Object):0 -> get
       # {"id":"com.android.tools.r8.synthesized"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap.keySet() -> h
     1:1:int hashCode():310:310 -> hashCode
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap.entrySet():297:297 -> hashCode
     2:2:int hashCode():311 -> hashCode
@@ -82994,8 +83404,8 @@
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet.iterator():136:136 -> hashCode
     4:4:int hashCode():311 -> hashCode
     5:5:int hashCode():313:313 -> hashCode
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap.object2BooleanEntrySet() -> k
     1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.keySet():37:37 -> keySet
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap.object2BooleanEntrySet() -> l
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.put(java.lang.Object,java.lang.Object):0 -> put
       # {"id":"com.android.tools.r8.synthesized"}
@@ -83059,11 +83469,11 @@
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:4:boolean equals(java.lang.Object):320:323 -> equals
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> g
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):108:108 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):0 -> get
       # {"id":"com.android.tools.r8.synthesized"}
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
     1:4:int hashCode():310:313 -> hashCode
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Object):0 -> put
@@ -83105,12 +83515,12 @@
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> entrySet
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229 -> entrySet
     2:3:java.util.Set entrySet():31 -> entrySet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229:229 -> g
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> g
-    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 -> g
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> g
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229 -> g
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229:229 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():1422:1423 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap -> com.android.tools.r8.internal.Q0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -83127,7 +83537,6 @@
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap.entrySet():297:297 -> equals
     5:5:boolean equals(java.lang.Object):323 -> equals
     6:6:boolean equals(java.lang.Object):323:323 -> equals
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap.object2LongEntrySet() -> g
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):108:108 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
@@ -83141,6 +83550,7 @@
     13:13:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):41 -> get
     13:13:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
       # {"id":"com.android.tools.r8.synthesized"}
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap.object2LongEntrySet() -> h
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
       # {"id":"com.android.tools.r8.synthesized"}
@@ -83198,10 +83608,10 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap.tailMap(java.lang.Object) -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectSortedMap.entrySet():226:226 -> entrySet
     1:1:java.util.Set entrySet():31 -> entrySet
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap.keySet() -> g
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap.keySet() -> h
     1:1:java.util.SortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap.headMap(java.lang.Object):1366:1366 -> headMap
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap.object2ObjectEntrySet() -> k
     1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.keySet():85:85 -> keySet
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap.object2ObjectEntrySet() -> l
     1:1:java.util.SortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$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.Object2ObjectRBTreeMap$Submap.tailMap(java.lang.Object):1366:1366 -> tailMap
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ObjectSortedMap$KeySet -> com.android.tools.r8.internal.T0:
@@ -83222,38 +83632,12 @@
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceMap -> com.android.tools.r8.internal.V0:
     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
+    1:1:java.util.Set entrySet():42:42 -> entrySet
+    1:4:boolean equals(java.lang.Object):272:275 -> equals
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():249:249 -> h
     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
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    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
+    1:18:java.lang.String toString():280:297 -> toString
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap -> com.android.tools.r8.internal.W0:
     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.AbstractObject2ReferenceSortedMap.entrySet():226:226 -> entrySet
@@ -83262,6 +83646,12 @@
     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
+    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 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():1348:1349 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():85 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2ReferenceSortedMap.entrySet():226 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObjectCollection -> com.android.tools.r8.internal.X0:
     1:1:void <init>():37:37 -> <init>
     1:1:java.util.Iterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap$3.iterator():1384:1384 -> iterator
@@ -83459,11 +83849,11 @@
       # {"id":"com.android.tools.r8.synthesized"}
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:4:boolean equals(java.lang.Object):320:323 -> equals
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> g
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):108:108 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):0 -> get
       # {"id":"com.android.tools.r8.synthesized"}
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
     1:4:int hashCode():310:313 -> hashCode
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Object):0 -> put
@@ -83504,11 +83894,11 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.reference2IntEntrySet():87:87 -> entrySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229 -> entrySet
     2:2:java.util.Set entrySet():31 -> entrySet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229:229 -> g
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> g
-    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 -> g
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229 -> g
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229:229 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.reference2IntEntrySet():87:87 -> h
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229 -> h
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongMap -> com.android.tools.r8.internal.l1:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -83696,7 +84086,7 @@
     1:7:int hashCode():57:63 -> hashCode
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.internal.r1:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.gK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.nK:
     java.lang.Object[] key -> b
     boolean[] value -> c
     int size -> d
@@ -83717,14 +84107,14 @@
     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
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():321:321 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():321:321 -> h
     1:1:boolean isEmpty():277:277 -> isEmpty
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.object2BooleanEntrySet():231:231 -> k
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2BooleanEntrySet():37 -> k
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.object2BooleanEntrySet():231:231 -> l
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2BooleanEntrySet():37 -> l
     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$EntrySet -> com.android.tools.r8.internal.fK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.mK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap this$0 -> b
     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>
@@ -83734,7 +84124,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.eK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.lK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -83743,7 +84133,7 @@
     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.Object2IntArrayMap -> com.android.tools.r8.internal.jK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.qK:
     java.lang.Object[] key -> c
     int[] value -> d
     int size -> e
@@ -83766,15 +84156,15 @@
     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
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.object2IntEntrySet():231:231 -> f
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():37 -> f
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.object2IntEntrySet():231:231 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():37 -> g
     1:1:boolean isEmpty():277:277 -> isEmpty
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():321:321 -> k
     1:1:java.util.Set keySet():37:37 -> keySet
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():321:321 -> l
     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$EntrySet -> com.android.tools.r8.internal.iK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.pK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap this$0 -> b
     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>
@@ -83784,7 +84174,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.hK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.oK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -83793,9 +84183,9 @@
     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.kK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.rK:
     int getInt(java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.tK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.AK:
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
     java.lang.Object[] key -> c
@@ -83835,10 +84225,10 @@
     1:11:boolean containsKey(java.lang.Object):738:748 -> containsKey
     1:5:boolean containsValue(int):754:758 -> d
     1:25:void fixPointers(int):899:923 -> f
-    26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():1422:1423 -> f
-    26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():87 -> f
     1:3:java.lang.Object firstKey():970:970 -> firstKey
-    1:42:void rehash(int):1709:1750 -> g
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():1422:1423 -> g
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():87 -> g
+    3:44:void rehash(int):1709:1750 -> g
     1: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
@@ -83851,8 +84241,8 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.headMap(java.lang.Object):1002:1002 -> headMap
     1:1:java.util.SortedMap headMap(java.lang.Object):87 -> headMap
     1:1:boolean isEmpty():785:785 -> isEmpty
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1531:1532 -> k
     1:1:java.util.Set keySet():87:87 -> keySet
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1531:1532 -> l
     1:3:java.lang.Object lastKey():981:981 -> lastKey
     1:1:void putAll(java.util.Map):296:296 -> putAll
     2:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.ensureCapacity(int):266:267 -> putAll
@@ -83860,9 +84250,19 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.size():780:780 -> putAll
     4:4:void putAll(java.util.Map):298 -> putAll
     5:5:void putAll(java.util.Map):298:298 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.tryCapacity(long):271:272 -> putAll
-    6:7:void putAll(java.util.Map):298 -> putAll
-    8:8:void putAll(java.util.Map):301:301 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    6:6:void putAll(java.util.Map):298 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    10:10:void putAll(java.util.Map):298 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    11:11:void putAll(java.util.Map):298 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    12:12:void putAll(java.util.Map):298 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.tryCapacity(long):272:272 -> putAll
+    8:8:void putAll(java.util.Map):298 -> putAll
+    9:9:void putAll(java.util.Map):301:301 -> putAll
     1:1:int size():780:780 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.subMap(java.lang.Object,java.lang.Object):1012:1012 -> subMap
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):87 -> subMap
@@ -83870,14 +84270,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.lK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.sK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     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 -> f
     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.mK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.tK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -83892,14 +84292,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.nK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.uK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
     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.oK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.vK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     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>
@@ -83921,7 +84321,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.pK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.wK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -83940,7 +84340,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.qK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.xK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     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>
@@ -83962,7 +84362,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.rK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.yK:
     int curr -> d
     int index -> e
     int prev -> b
@@ -83980,7 +84380,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.sK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.zK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
     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
@@ -83995,11 +84395,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.wK:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.uK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.vK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.FK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.DK:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> g
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.BK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.CK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.MK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> c
@@ -84032,18 +84432,18 @@
     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:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.object2IntEntrySet():761:762 -> f
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():49 -> f
-    3:9:void rehash(int):961:967 -> f
-    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.realSize():205:205 -> f
-    10:10:void rehash(int):968 -> f
-    11:23:void rehash(int):969:981 -> f
+    1: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:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.object2IntEntrySet():761:762 -> g
+    16:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():49 -> g
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
@@ -84056,20 +84456,30 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.size():429:429 -> putAll
     4:4:void putAll(java.util.Map):239 -> putAll
     5:5:void putAll(java.util.Map):239:239 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.tryCapacity(long):214:215 -> putAll
-    6:7:void putAll(java.util.Map):239 -> putAll
-    8:8:void putAll(java.util.Map):242:242 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.tryCapacity(long):214:214 -> putAll
+    6:6:void putAll(java.util.Map):239 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.tryCapacity(long):214:214 -> putAll
+    10:10:void putAll(java.util.Map):239 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.tryCapacity(long):214:214 -> putAll
+    11:11:void putAll(java.util.Map):239 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.tryCapacity(long):214:214 -> putAll
+    12:12:void putAll(java.util.Map):239 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.tryCapacity(long):215:215 -> putAll
+    8:8:void putAll(java.util.Map):239 -> putAll
+    9:9:void putAll(java.util.Map):242:242 -> putAll
     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.xK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.EK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     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 -> f
     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.yK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.FK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry entry -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> i
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):654:654 -> <init>
@@ -84077,11 +84487,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.zK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.GK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
     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.AK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.HK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     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>
@@ -84090,7 +84500,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.BK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.IK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):473:474 -> <init>
@@ -84109,7 +84519,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.CK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.JK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     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>
@@ -84118,7 +84528,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.DK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.KK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> f
     boolean mustReturnNullKey -> e
     int c -> d
@@ -84137,16 +84547,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.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.EK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.LK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):830:831 -> <init>
     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
     1:1:int nextInt():836:836 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.GK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.HK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.IK:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.RK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.NK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.OK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.PK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.YK:
     long[] value -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     java.lang.Object[] key -> b
@@ -84188,8 +84598,8 @@
     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 -> g
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2LongEntrySet():49 -> g
+    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 -> h
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2LongEntrySet():49 -> h
     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
@@ -84202,13 +84612,23 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.size():429:429 -> putAll
     4:4:void putAll(java.util.Map):239 -> putAll
     5:5:void putAll(java.util.Map):239:239 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.tryCapacity(long):214:215 -> putAll
-    6:7:void putAll(java.util.Map):239 -> putAll
-    8:8:void putAll(java.util.Map):242:242 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.tryCapacity(long):214:214 -> putAll
+    6:6:void putAll(java.util.Map):239 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.tryCapacity(long):214:214 -> putAll
+    10:10:void putAll(java.util.Map):239 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.tryCapacity(long):214:214 -> putAll
+    11:11:void putAll(java.util.Map):239 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.tryCapacity(long):214:214 -> putAll
+    12:12:void putAll(java.util.Map):239 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.tryCapacity(long):215:215 -> putAll
+    8:8:void putAll(java.util.Map):239 -> putAll
+    9:9:void putAll(java.util.Map):242:242 -> putAll
     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.JK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.QK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     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
@@ -84220,7 +84640,7 @@
     3:6:boolean contains(long):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.KK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.RK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):654:654 -> <init>
@@ -84228,11 +84648,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.LK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.SK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
     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.MK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.TK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     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>
@@ -84241,7 +84661,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.NK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.UK:
     int index -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> c
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):473:474 -> <init>
@@ -84260,7 +84680,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.OK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.VK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     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>
@@ -84269,7 +84689,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.PK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.WK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> f
     boolean mustReturnNullKey -> e
     int c -> d
@@ -84288,13 +84708,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.QK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.XK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):830:831 -> <init>
     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
     1:1:long nextLong():836:836 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.aL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.hL:
     java.lang.Object[] value -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection values -> p
     int maxFill -> l
@@ -84337,17 +84757,17 @@
     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
     1:3:java.lang.Object firstKey():927:927 -> firstKey
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1488:1489 -> g
     1:11:java.lang.Object get(java.lang.Object):701:711 -> get
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1488:1489 -> h
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.realSize():291:291 -> hashCode
     1:1:int hashCode():1729 -> hashCode
     2:10:int hashCode():1730:1738 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.headMap(java.lang.Object):959:959 -> headMap
     1:1:java.util.SortedMap headMap(java.lang.Object):85 -> headMap
     1:1:boolean isEmpty():766:766 -> isEmpty
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ObjectEntrySet():85:85 -> k
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet object2ObjectEntrySet():1379:1380 -> l
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ObjectEntrySet():85:85 -> l
     1:3:java.lang.Object lastKey():938:938 -> lastKey
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet object2ObjectEntrySet():1379:1380 -> m
     1:26:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.insert(java.lang.Object,java.lang.Object):337:362 -> put
     1:26:java.lang.Object put(java.lang.Object,java.lang.Object):369 -> put
     27:29:java.lang.Object put(java.lang.Object,java.lang.Object):370:372 -> put
@@ -84357,9 +84777,19 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.size():761:761 -> putAll
     4:4:void putAll(java.util.Map):329 -> putAll
     5:5:void putAll(java.util.Map):329:329 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.tryCapacity(long):300:301 -> putAll
-    6:7:void putAll(java.util.Map):329 -> putAll
-    8:8:void putAll(java.util.Map):332:332 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.tryCapacity(long):300:300 -> putAll
+    6:6:void putAll(java.util.Map):329 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.tryCapacity(long):300:300 -> putAll
+    10:10:void putAll(java.util.Map):329 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.tryCapacity(long):300:300 -> putAll
+    11:11:void putAll(java.util.Map):329 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.tryCapacity(long):300:300 -> putAll
+    12:12:void putAll(java.util.Map):329 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.tryCapacity(long):301:301 -> putAll
+    8:8:void putAll(java.util.Map):329 -> putAll
+    9:9:void putAll(java.util.Map):332:332 -> putAll
     1:2:java.lang.Object remove(java.lang.Object):408:409 -> remove
     3:9:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.removeNullEntry():315:321 -> remove
     3:9:java.lang.Object remove(java.lang.Object):409 -> remove
@@ -84371,14 +84801,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.SK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.ZK:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     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.TK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.aL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1181:1181 -> <init>
@@ -84393,14 +84823,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.UK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.bL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
     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.VK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.cL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     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>
@@ -84422,7 +84852,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.WK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.dL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):805:806 -> <init>
@@ -84432,7 +84862,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.XK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.eL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     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>
@@ -84454,7 +84884,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.YK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.fL:
     int curr -> d
     int index -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
@@ -84472,16 +84902,16 @@
     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.ZK:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.gL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
     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.cL:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.bL:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap -> com.android.tools.r8.internal.uL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.jL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.iL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap -> com.android.tools.r8.internal.BL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry tree -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> h
@@ -84529,12 +84959,12 @@
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry.right():739:739 -> e
     6:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry findKey(java.lang.Object):236 -> e
     1:3:java.lang.Object firstKey():956:956 -> firstKey
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1261:1262 -> g
     1:2:java.lang.Object get(java.lang.Object):950:951 -> get
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1261:1262 -> h
     1:1:boolean isEmpty():944:944 -> isEmpty
-    1:77:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ObjectEntrySet():1116:1192 -> k
-    1:2:void allocatePaths():268:269 -> l
+    1:77:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ObjectEntrySet():1116:1192 -> l
     1:3:java.lang.Object lastKey():962:962 -> lastKey
+    1:2:void allocatePaths():268:269 -> m
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.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.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> put
@@ -84593,7 +85023,7 @@
     1:1:int size():939:939 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.values():1311:1332 -> values
     1:22:java.util.Collection values():43 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1 -> com.android.tools.r8.internal.eL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1 -> com.android.tools.r8.internal.lL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap this$0 -> c
     java.util.Comparator comparator -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):1116:1117 -> <init>
@@ -84616,20 +85046,20 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1116:1116 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1189:1189 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1116 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1$1 -> com.android.tools.r8.internal.dL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1$1 -> com.android.tools.r8.internal.kL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$1 this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$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.Object2ObjectRBTreeMap$1$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$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.Object2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.fL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$2 -> com.android.tools.r8.internal.mL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):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.Object2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.gL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry -> com.android.tools.r8.internal.nL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry left -> d
     int info -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry right -> e
@@ -84650,7 +85080,7 @@
     1:1:int hashCode():906:906 -> hashCode
     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.Object2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.hL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$EntryIterator -> com.android.tools.r8.internal.oL:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):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.Object2ObjectRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1110:1110 -> add
@@ -84662,18 +85092,18 @@
     1:1:void set(java.lang.Object):1085:1085 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1105:1105 -> set
     2:2:void set(java.lang.Object):1085 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.iL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$KeyIterator -> com.android.tools.r8.internal.pL:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):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.Object2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.jL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$KeySet -> com.android.tools.r8.internal.qL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap this$0 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):1237:1237 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$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.Object2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.rL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap -> com.android.tools.r8.internal.yL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> h
     java.lang.Object to -> d
@@ -84710,8 +85140,8 @@
     4:4:boolean in(java.lang.Object):1423 -> e
     1:3:java.lang.Object firstKey():1679:1681 -> firstKey
     4:4:java.lang.Object firstKey():1680:1680 -> firstKey
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1521:1522 -> g
     1:1:java.lang.Object get(java.lang.Object):1569:1569 -> get
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1521:1522 -> h
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1703:1703 -> isEmpty
     1:1:boolean isEmpty():1602 -> isEmpty
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):998:998 -> isEmpty
@@ -84719,47 +85149,47 @@
     2:2:boolean isEmpty():1602 -> isEmpty
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1704:1704 -> isEmpty
     3:3:boolean isEmpty():1602 -> isEmpty
-    1:79:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ObjectEntrySet():1428:1506 -> k
-    1:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1638:1644 -> l
-    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):252:252 -> l
-    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1644 -> l
-    9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> l
-    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):252 -> l
-    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1644 -> l
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry.left():729:729 -> l
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):254 -> l
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1644 -> l
-    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry.right():739:739 -> l
-    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):254 -> l
-    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1644 -> l
-    12:12:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1646:1646 -> l
-    13:13:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> l
-    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1646 -> l
-    14:16:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry.next():855:857 -> l
-    14:16:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1646 -> l
-    17:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1650:1650 -> l
-    18:18:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> l
-    18:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1650 -> l
+    1:79:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ObjectEntrySet():1428:1506 -> l
     1:3:java.lang.Object lastKey():1686:1688 -> lastKey
     4:4:java.lang.Object lastKey():1687:1687 -> lastKey
-    1:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1661:1667 -> m
+    1:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1638:1644 -> m
     8:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):252:252 -> m
-    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1667 -> m
+    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1644 -> m
     9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> m
     9:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):252 -> m
-    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1667 -> m
+    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1644 -> m
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry.left():729:729 -> m
     10:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):254 -> m
-    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1667 -> m
+    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1644 -> m
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry.right():739:739 -> m
     11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):254 -> m
-    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1667 -> m
-    12:12:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1669:1669 -> m
+    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1644 -> m
+    12:12:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1646:1646 -> m
     13:13:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> m
-    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1669 -> m
-    14:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1669:1673 -> m
-    19:19:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> m
-    19:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1673 -> m
+    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1646 -> m
+    14:16:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry.next():855:857 -> m
+    14:16:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1646 -> m
+    17:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1650:1650 -> m
+    18:18:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> m
+    18:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry firstEntry():1650 -> m
+    1:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1661:1667 -> n
+    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):252:252 -> n
+    8:8:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1667 -> n
+    9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> n
+    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):252 -> n
+    9:9:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1667 -> n
+    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry.left():729:729 -> n
+    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):254 -> n
+    10:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1667 -> n
+    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry.right():739:739 -> n
+    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.locateKey(java.lang.Object):254 -> n
+    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1667 -> n
+    12:12:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1669:1669 -> n
+    13:13:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> n
+    13:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1669 -> n
+    14:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1669:1673 -> n
+    19:19:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> n
+    19:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry lastEntry():1673 -> n
     1:2:java.lang.Object put(java.lang.Object,java.lang.Object):1574:1575 -> put
     3:3:java.lang.Object put(java.lang.Object,java.lang.Object):0:0 -> put
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1581,"2":1582,"3":1583}}
@@ -84771,7 +85201,7 @@
     1:5:int size():1591:1595 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap.values():1527:1544 -> values
     1:18:java.util.Collection values():1366 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.kL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$1 -> com.android.tools.r8.internal.rL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1428:1428 -> <init>
     1:1:void clear():1478:1478 -> clear
@@ -84804,19 +85234,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1428:1428 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1503:1503 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1428 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.lL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$2 -> com.android.tools.r8.internal.sL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$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.Object2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.mL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.tL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap this$1 -> c
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1509:1509 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$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.Object2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.nL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.uL:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$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.Object2ObjectRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1758:1758 -> add
@@ -84828,7 +85258,7 @@
     1:1:void set(java.lang.Object):1733:1733 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1753:1753 -> set
     2:2:void set(java.lang.Object):1733 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.oL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.vL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap this$1 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1703:1704 -> <init>
     1:1:void updateNext():1728:1728 -> l
@@ -84845,20 +85275,20 @@
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> m
     3:3:void updatePrevious():1724 -> m
     4:4:void updatePrevious():1724:1724 -> m
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.pL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.wL:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$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.Object2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.qL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.xL:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap):1812:1812 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$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.Object2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.sL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$TreeIterator -> com.android.tools.r8.internal.zL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry next -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry curr -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$Entry prev -> b
@@ -84881,15 +85311,15 @@
     1:1:int nextIndex():1043:1043 -> nextIndex
     1:1:int previousIndex():1047:1047 -> previousIndex
     1:12:void remove():1051:1051 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.tL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$ValueIterator -> com.android.tools.r8.internal.AL:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap):1275:1275 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectRBTreeMap$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.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.vL:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.EL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.CL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.LL:
     java.lang.Object[] key -> b
     java.lang.Object[] value -> c
     int maxFill -> j
@@ -84921,7 +85351,9 @@
     1:11:boolean containsKey(java.lang.Object):687:697 -> containsKey
     1:5:boolean containsValue(java.lang.Object):703:707 -> containsValue
     1:25:void fixPointers(int):825:849 -> d
-    1:42:void rehash(int):1611:1652 -> e
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.object2ReferenceEntrySet():1348:1349 -> e
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2ReferenceEntrySet():85 -> e
+    3:44:void rehash(int):1611:1652 -> e
     1:4:java.lang.Object removeEntry(int):274:277 -> f
     5:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.shiftKeys(int):356:362 -> f
     5:11:java.lang.Object removeEntry(int):278 -> f
@@ -84948,9 +85380,19 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.size():730:730 -> putAll
     4:4:void putAll(java.util.Map):298 -> putAll
     5:5:void putAll(java.util.Map):298:298 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.tryCapacity(long):269:270 -> putAll
-    6:7:void putAll(java.util.Map):298 -> putAll
-    8:8:void putAll(java.util.Map):301:301 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.tryCapacity(long):269:269 -> putAll
+    6:6:void putAll(java.util.Map):298 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.tryCapacity(long):269:269 -> putAll
+    10:10:void putAll(java.util.Map):298 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.tryCapacity(long):269:269 -> putAll
+    11:11:void putAll(java.util.Map):298 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.tryCapacity(long):269:269 -> putAll
+    12:12:void putAll(java.util.Map):298 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.tryCapacity(long):270:270 -> putAll
+    8:8:void putAll(java.util.Map):298 -> putAll
+    9:9:void putAll(java.util.Map):301:301 -> putAll
     1:1:java.lang.Object remove(java.lang.Object):378:378 -> remove
     2:8:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.removeNullEntry():284:290 -> remove
     2:8:java.lang.Object remove(java.lang.Object):378 -> remove
@@ -84962,14 +85404,14 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.values():1498:1519 -> values
     1:22:java.util.Collection values():85 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.wL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.DL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     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.xL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.EL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1150:1150 -> <init>
@@ -84984,14 +85426,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.yL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.FL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
     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.zL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.GL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     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>
@@ -85013,7 +85455,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.AL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.HL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):774:775 -> <init>
@@ -85023,7 +85465,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.BL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.IL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     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>
@@ -85045,7 +85487,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.CL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.JL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -85063,17 +85505,162 @@
     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.DL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.KL:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
     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.GL:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.FL:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.HL:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.LL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.OL:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2ReferenceEntrySet() -> e
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.ML:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.NL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap -> com.android.tools.r8.internal.XL:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
+    java.lang.Object[] key -> b
+    java.lang.Object[] value -> c
+    int size -> h
+    boolean containsNullKey -> e
+    int n -> f
+    int maxFill -> g
+    int mask -> d
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$FastEntrySet entries -> i
+    1:9:void <init>(int,float):90:98 -> <init>
+    1:1:java.lang.Object access$400(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap,int):48:48 -> a
+    2:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.removeNullEntry():227:227 -> a
+    2:2:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap):48 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    3:7:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.removeNullEntry():228:232 -> a
+    3:7:java.lang.Object access$300(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap):48 -> a
+    1:5:void clear():378:382 -> clear
+    1:10:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.clone():927:936 -> clone
+    1:10:java.lang.Object clone():48 -> clone
+    11:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.clone():929:929 -> clone
+    11:11:java.lang.Object clone():48 -> clone
+    1:11:boolean containsKey(java.lang.Object):345:355 -> containsKey
+    1:5:boolean containsValue(java.lang.Object):361:365 -> containsValue
+    1:7:void rehash(int):889:895 -> d
+    8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.realSize():204:204 -> d
+    8:8:void rehash(int):896 -> d
+    9:21:void rehash(int):897:909 -> d
+    1:3:java.lang.Object removeEntry(int):218:220 -> e
+    4:10:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.shiftKeys(int):289:295 -> e
+    4:10:java.lang.Object removeEntry(int):221 -> e
+    11:11:java.lang.Object removeEntry(int):222:222 -> e
+    12:17:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.shiftKeys(int):298:303 -> e
+    12:17:java.lang.Object removeEntry(int):221 -> e
+    18:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.object2ReferenceEntrySet():695:696 -> e
+    18:19:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2ReferenceEntrySet():48 -> e
+    1:11:java.lang.Object get(java.lang.Object):328:338 -> get
+    1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.realSize():204:204 -> hashCode
+    1:1:int hashCode():953 -> hashCode
+    2:10:int hashCode():954:962 -> hashCode
+    1:1:boolean isEmpty():392:392 -> isEmpty
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.keySet():750:751 -> keySet
+    1:2:java.util.Set keySet():48 -> keySet
+    1:16:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.insert(java.lang.Object,java.lang.Object):249:264 -> put
+    1:16:java.lang.Object put(java.lang.Object,java.lang.Object):271 -> put
+    17:18:java.lang.Object put(java.lang.Object,java.lang.Object):273:274 -> put
+    1:1:void putAll(java.util.Map):238:238 -> putAll
+    2:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.ensureCapacity(int):208:209 -> putAll
+    2:3:void putAll(java.util.Map):238 -> putAll
+    4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.size():387:387 -> putAll
+    4:4:void putAll(java.util.Map):240 -> putAll
+    5:5:void putAll(java.util.Map):240:240 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.tryCapacity(long):213:213 -> putAll
+    6:6:void putAll(java.util.Map):240 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.tryCapacity(long):213:213 -> putAll
+    10:10:void putAll(java.util.Map):240 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.tryCapacity(long):213:213 -> putAll
+    11:11:void putAll(java.util.Map):240 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.tryCapacity(long):213:213 -> putAll
+    12:12:void putAll(java.util.Map):240 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.tryCapacity(long):214:214 -> putAll
+    8:8:void putAll(java.util.Map):240 -> putAll
+    9:9:void putAll(java.util.Map):243:243 -> putAll
+    1:1:java.lang.Object remove(java.lang.Object):310:310 -> remove
+    2:7:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.removeNullEntry():227:232 -> remove
+    2:7:java.lang.Object remove(java.lang.Object):310 -> remove
+    8:15:java.lang.Object remove(java.lang.Object):314:321 -> remove
+    1:1:int size():387:387 -> size
+    1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.values():776:797 -> values
+    1:22:java.util.Collection values():48 -> values
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.PL:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap this$0 -> b
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap):776:776 -> <init>
+    1:1:void clear():794:794 -> clear
+    1:1:boolean contains(java.lang.Object):789:789 -> contains
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():779:779 -> iterator
+    1:1:int size():784:784 -> size
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.QL:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$MapEntry entry -> h
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap this$0 -> i
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap):590:590 -> <init>
+    2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$1):590:590 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$EntryIterator.next():595:595 -> next
+    1:1:java.lang.Object next():590 -> next
+    1:2:void remove():600:601 -> remove
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.RL:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap this$0 -> h
+    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap):709:710 -> <init>
+    1:1:java.lang.Object next():715:715 -> next
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.SL:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap this$0 -> b
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap):719:719 -> <init>
+    2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$1):719:719 -> <init>
+    1:1:void clear():744:744 -> clear
+    1:1:boolean contains(java.lang.Object):732:732 -> contains
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():722:722 -> iterator
+    1:3:boolean remove(java.lang.Object):737:739 -> remove
+    1:1:int size():727:727 -> size
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.TL:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap this$0 -> c
+    int index -> b
+    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap,int):431:432 -> <init>
+    1:3:boolean equals(java.lang.Object):458:460 -> equals
+    1:1:java.lang.Object getKey():440:440 -> getKey
+    1:1:java.lang.Object getValue():445:445 -> getValue
+    1:1:int hashCode():465:465 -> hashCode
+    1:2:java.lang.Object setValue(java.lang.Object):450:451 -> setValue
+    1:1:java.lang.String toString():470:470 -> toString
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.UL:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap this$0 -> b
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap):615:615 -> <init>
+    2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$1):615:615 -> <init>
+    1:1:void clear():689:689 -> clear
+    1:15:boolean contains(java.lang.Object):627:641 -> contains
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():617:617 -> iterator
+    1:28:boolean remove(java.lang.Object):648:675 -> remove
+    1:1:int size():684:684 -> size
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.VL:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> f
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap this$0 -> g
+    boolean mustReturnNullKey -> e
+    int c -> d
+    int pos -> b
+    int last -> c
+    1:24:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap):475:498 -> <init>
+    25:25:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$1):475:475 -> <init>
+    1:1:boolean hasNext():506:506 -> hasNext
+    1:19:int nextEntry():510:510 -> j
+    1:6:void remove():565:570 -> remove
+    7:13:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$MapIterator.shiftKeys(int):542:548 -> remove
+    7:13:void remove():570 -> remove
+    14:15:void remove():577:578 -> remove
+    16:25:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$MapIterator.shiftKeys(int):551:560 -> remove
+    16:25:void remove():570 -> remove
+    26:27:void remove():573:574 -> remove
+    28:28:void remove():565:565 -> remove
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.WL:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap this$0 -> h
+    1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap):764:765 -> <init>
+    1:1:java.lang.Object next():770:770 -> next
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.YL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.cM:
     java.lang.Object[] a -> b
     int size -> c
     1:3:void <init>(int):96:98 -> <init>
@@ -85151,7 +85738,7 @@
     728:728:java.lang.Object set(int,java.lang.Object):357:357 -> set
     720:720: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.KL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.bM:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -85165,7 +85752,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.NL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.eM:
     java.lang.Object[] a -> b
     int size -> c
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
@@ -85204,23 +85791,23 @@
     1:2:boolean remove(java.lang.Object):154 -> remove
     3:7:boolean remove(java.lang.Object):156: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.ML:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.dM:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet this$0 -> c
     int next -> 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.OL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.fM:
 # {"id":"sourceFile","fileName":"ObjectArrays.java"}
     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.QL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.hM:
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.BidirectionalIterator.previous() -> previous
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.RL:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.internal.UL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.iM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections -> com.android.tools.r8.internal.lM:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):383:383 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.SL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.jM:
     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.ObjectBidirectionalIterator iterator():55:55 -> iterator
@@ -85231,7 +85818,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.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.internal.TL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$UnmodifiableCollection -> com.android.tools.r8.internal.kM:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection collection -> b
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection):276:278 -> <init>
     1:1:boolean add(java.lang.Object):283:283 -> add
@@ -85253,16 +85840,16 @@
     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.ObjectIterator -> com.android.tools.r8.internal.WL:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.aM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.nM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.rM:
     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.XL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.oM:
     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.YL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$SingletonIterator -> com.android.tools.r8.internal.pM:
     java.lang.Object element -> b
     int curr -> c
     1:2:void <init>(java.lang.Object):127:128 -> <init>
@@ -85272,24 +85859,24 @@
     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.ZL:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.qM:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator i -> b
     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.bM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.sM:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.cM:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.eM:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.hM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.tM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.vM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.yM:
     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.fM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.wM:
     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.gM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$Singleton -> com.android.tools.r8.internal.xM:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):96:97 -> <init>
     1:1:boolean addAll(java.util.Collection):122:122 -> addAll
@@ -85307,11 +85894,11 @@
     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.iM:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.kM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.zM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.BM:
     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.jM:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.AM:
     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
@@ -85322,17 +85909,17 @@
     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.QS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunction -> com.android.tools.r8.internal.lT:
     boolean getBoolean(java.lang.Object) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.TS:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.RS:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.SS:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.WS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.oT:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet() -> j
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.mT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.nT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps -> com.android.tools.r8.internal.rT:
     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.US:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$EmptyMap -> com.android.tools.r8.internal.pT:
     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
@@ -85346,7 +85933,7 @@
     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 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():73:73 -> j
     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
@@ -85356,7 +85943,7 @@
     1:1:java.lang.String toString():127:127 -> toString
     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.VS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMaps$Singleton -> com.android.tools.r8.internal.qT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> f
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanFunctions$Singleton.key -> b
@@ -85380,10 +85967,10 @@
     5:5:boolean equals(java.lang.Object):235 -> equals
     6:6:boolean equals(java.lang.Object):235:235 -> equals
     1:1:int hashCode():226:226 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():190:190 -> i
-    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 -> i
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():190 -> i
-    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():190:191 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():190:190 -> j
+    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 -> j
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():190 -> j
+    3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():190:191 -> j
     1:1:java.util.Set keySet():157:157 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():209:209 -> keySet
     3:3: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
@@ -85400,7 +85987,7 @@
     241:241: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.fT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.AT:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> k
     java.lang.Object[] key -> b
     boolean[] value -> c
@@ -85463,13 +86050,13 @@
     6:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap.equals(java.lang.Object):323:323 -> equals
     6:6:boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap.equals(java.lang.Object):0 -> equals
       # {"id":"com.android.tools.r8.synthesized"}
-    1:5:boolean removeNullEntry():227:231 -> g
+    1:5:boolean removeNullEntry():227:231 -> h
     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: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 -> i
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():49 -> i
     1:1:boolean isEmpty():389:389 -> isEmpty
+    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 -> j
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2BooleanEntrySet():49 -> j
     1:1:java.util.Set keySet():49:49 -> keySet
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():771:772 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
@@ -85478,13 +86065,23 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.size():384:384 -> putAll
     4:4:void putAll(java.util.Map):239 -> putAll
     5:5:void putAll(java.util.Map):239:239 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.tryCapacity(long):214:215 -> putAll
-    6:7:void putAll(java.util.Map):239 -> putAll
-    8:20:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap.putAll(java.util.Map):82:94 -> putAll
-    8:20:void putAll(java.util.Map):242 -> putAll
-    21:22:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:124 -> putAll
-    21:22:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap.putAll(java.util.Map):94 -> putAll
-    21:22:void putAll(java.util.Map):242 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.tryCapacity(long):214:214 -> putAll
+    6:6:void putAll(java.util.Map):239 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":24,"2":25,"3":26}}
+    24:24:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.tryCapacity(long):214:214 -> putAll
+    24:24:void putAll(java.util.Map):239 -> putAll
+    25:25:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.tryCapacity(long):214:214 -> putAll
+    25:25:void putAll(java.util.Map):239 -> putAll
+    26:26:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.tryCapacity(long):214:214 -> putAll
+    26:26:void putAll(java.util.Map):239 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.tryCapacity(long):215:215 -> putAll
+    8:8:void putAll(java.util.Map):239 -> putAll
+    9:21:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap.putAll(java.util.Map):82:94 -> putAll
+    9:21:void putAll(java.util.Map):242 -> putAll
+    22:23:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:124 -> putAll
+    22:23:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap.putAll(java.util.Map):94 -> putAll
+    22:23:void putAll(java.util.Map):242 -> putAll
     1:1:int size():384:384 -> size
     1:1:java.lang.String com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap.toString():328:328 -> toString
     1:1:java.lang.String com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanMap.toString():0 -> toString
@@ -85505,7 +86102,7 @@
       # {"id":"com.android.tools.r8.synthesized"}
     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.XS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.sT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     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
@@ -85517,7 +86114,7 @@
     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.YS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.tT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):609:609 -> <init>
@@ -85525,11 +86122,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.ZS:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.uT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
     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.aT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.vT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     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>
@@ -85538,7 +86135,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():743:743 -> iterator
     1:3:boolean remove(java.lang.Object):758:760 -> remove
     1:1:int size():748:748 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.bT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.wT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,int):428:429 -> <init>
@@ -85557,7 +86154,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.cT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.xT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     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>
@@ -85566,7 +86163,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.dT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.yT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
@@ -85585,13 +86182,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.eT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.zT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):785:786 -> <init>
     1:1:boolean nextBoolean():791:791 -> g
     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.iT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.DT:
     java.lang.Object[] key -> c
     int[] value -> d
     int size -> e
@@ -85620,15 +86217,15 @@
     1:3:boolean containsKey(java.lang.Object):265 -> containsKey
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> d
     2:3:boolean containsValue(int):270:271 -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.reference2IntEntrySet():231:231 -> e
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():37 -> e
+    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 -> f
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():37 -> f
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.keySet():321:321 -> keySet
     1:1:java.util.Set keySet():37 -> 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$EntrySet -> com.android.tools.r8.internal.hT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.CT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap this$0 -> b
     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>
@@ -85638,7 +86235,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.gT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.BT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> d
     int curr -> b
     int next -> c
@@ -85647,9 +86244,9 @@
     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.jT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.ET:
     int getInt(java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.sT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.NT:
     int size -> l
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> o
     java.lang.Object[] key -> c
@@ -85689,8 +86286,8 @@
     12:12:java.lang.Object clone():87 -> clone
     1:10:boolean containsKey(java.lang.Object):738:747 -> containsKey
     1:5:boolean containsValue(int):754:758 -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():87:87 -> e
-    1:25:void fixPointers(int):899:923 -> f
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():87:87 -> f
+    2:26:void fixPointers(int):899:923 -> f
     1:3:java.lang.Object firstKey():970:970 -> firstKey
     1:42:void rehash(int):1709:1750 -> g
     1:3:int removeEntry(int):276:278 -> h
@@ -85705,19 +86302,29 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.headMap(java.lang.Object):1002:1002 -> headMap
     1:1:java.util.SortedMap headMap(java.lang.Object):87 -> headMap
     1:1:boolean isEmpty():785:785 -> isEmpty
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet keySet():1531:1532 -> k
     1:1:java.util.Set keySet():87:87 -> keySet
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet reference2IntEntrySet():1422:1423 -> l
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet keySet():1531:1532 -> l
     1:3:java.lang.Object lastKey():981:981 -> lastKey
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet reference2IntEntrySet():1422:1423 -> m
     1:1:void putAll(java.util.Map):296:296 -> putAll
     2:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.ensureCapacity(int):266:267 -> putAll
     2:3:void putAll(java.util.Map):296 -> putAll
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.size():780:780 -> putAll
     4:4:void putAll(java.util.Map):298 -> putAll
     5:5:void putAll(java.util.Map):298:298 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.tryCapacity(long):271:272 -> putAll
-    6:7:void putAll(java.util.Map):298 -> putAll
-    8:8:void putAll(java.util.Map):301:301 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    6:6:void putAll(java.util.Map):298 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    10:10:void putAll(java.util.Map):298 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    11:11:void putAll(java.util.Map):298 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.tryCapacity(long):271:271 -> putAll
+    12:12:void putAll(java.util.Map):298 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.tryCapacity(long):272:272 -> putAll
+    8:8:void putAll(java.util.Map):298 -> putAll
+    9:9:void putAll(java.util.Map):301:301 -> putAll
     1:1:int size():780:780 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.subMap(java.lang.Object,java.lang.Object):1012:1012 -> subMap
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):87 -> subMap
@@ -85725,14 +86332,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.kT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.FT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     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 -> f
     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.lT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.GT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -85747,14 +86354,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.mT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.HT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
     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.nT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.IT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     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>
@@ -85774,7 +86381,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.oT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.JT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -85793,7 +86400,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.pT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.KT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     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>
@@ -85815,7 +86422,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.qT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.LT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     int curr -> d
     int index -> e
@@ -85833,7 +86440,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.rT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.MT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
     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
@@ -85848,11 +86455,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.vT:
-    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.tT:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.uT:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.ET:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.QT:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> f
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.OT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.PT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.ZT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> l
     java.lang.Object[] key -> c
@@ -85888,12 +86495,12 @@
     11:11:java.lang.Object clone():49 -> clone
     1:10:boolean containsKey(java.lang.Object):388:397 -> containsKey
     1:5:boolean containsValue(int):404:408 -> d
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.reference2IntEntrySet():761:762 -> e
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():49 -> e
-    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:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.reference2IntEntrySet():761:762 -> f
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():49 -> f
+    3:9:void rehash(int):961:967 -> f
+    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.realSize():205:205 -> f
+    10:10:void rehash(int):968 -> f
+    11:23:void rehash(int):969:981 -> f
     1:2:int removeEntry(int):219:220 -> g
     3:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.shiftKeys(int):333:338 -> g
     3:8:int removeEntry(int):221 -> g
@@ -85912,20 +86519,30 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.size():429:429 -> putAll
     4:4:void putAll(java.util.Map):239 -> putAll
     5:5:void putAll(java.util.Map):239:239 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.tryCapacity(long):214:215 -> putAll
-    6:7:void putAll(java.util.Map):239 -> putAll
-    8:8:void putAll(java.util.Map):242:242 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.tryCapacity(long):214:214 -> putAll
+    6:6:void putAll(java.util.Map):239 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.tryCapacity(long):214:214 -> putAll
+    10:10:void putAll(java.util.Map):239 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.tryCapacity(long):214:214 -> putAll
+    11:11:void putAll(java.util.Map):239 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.tryCapacity(long):214:214 -> putAll
+    12:12:void putAll(java.util.Map):239 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.tryCapacity(long):215:215 -> putAll
+    8:8:void putAll(java.util.Map):239 -> putAll
+    9:9:void putAll(java.util.Map):242:242 -> putAll
     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.wT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.RT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     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 -> f
     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.xT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.ST:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):654:654 -> <init>
@@ -85933,11 +86550,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.yT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.TT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     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.zT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.UT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     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>
@@ -85946,7 +86563,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.AT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.VT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):473:474 -> <init>
@@ -85965,7 +86582,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.BT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.WT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     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>
@@ -85974,7 +86591,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.CT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.XT:
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
     int c -> d
@@ -85993,16 +86610,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.DT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.YT:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     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
     1:1:int nextInt():836:836 -> nextInt
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.FT:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.GT:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.HT:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.QT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.aU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.bU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.cU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.lU:
     long[] value -> c
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet entries -> i
@@ -86057,13 +86674,23 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.size():429:429 -> putAll
     4:4:void putAll(java.util.Map):239 -> putAll
     5:5:void putAll(java.util.Map):239:239 -> putAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.tryCapacity(long):214:215 -> putAll
-    6:7:void putAll(java.util.Map):239 -> putAll
-    8:8:void putAll(java.util.Map):242:242 -> putAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.tryCapacity(long):214:214 -> putAll
+    6:6:void putAll(java.util.Map):239 -> putAll
+    7:7:void putAll(java.util.Map):0:0 -> putAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.tryCapacity(long):214:214 -> putAll
+    10:10:void putAll(java.util.Map):239 -> putAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.tryCapacity(long):214:214 -> putAll
+    11:11:void putAll(java.util.Map):239 -> putAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.tryCapacity(long):214:214 -> putAll
+    12:12:void putAll(java.util.Map):239 -> putAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.tryCapacity(long):215:215 -> putAll
+    8:8:void putAll(java.util.Map):239 -> putAll
+    9:9:void putAll(java.util.Map):242:242 -> putAll
     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.IT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.dU:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     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
@@ -86075,7 +86702,7 @@
     3:6:boolean contains(long):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.JT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.eU:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry entry -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):654:654 -> <init>
@@ -86083,11 +86710,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.KT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.fU:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
     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.LT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.gU:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     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>
@@ -86096,7 +86723,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.MT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.hU:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> c
     int index -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):473:474 -> <init>
@@ -86114,7 +86741,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.NT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.iU:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     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>
@@ -86123,7 +86750,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.OT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.jU:
     boolean mustReturnNullKey -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
     int c -> d
@@ -86142,13 +86769,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.PT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.kU:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):830:831 -> <init>
     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
     1:1:long nextLong():836:836 -> nextLong
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.ST:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.nU:
     java.lang.Object[] a -> b
     int size -> c
     1:3:void <init>(int):96:98 -> <init>
@@ -86226,7 +86853,7 @@
     728:728:java.lang.Object set(int,java.lang.Object):357:357 -> set
     720:720: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.RT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.mU:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int pos -> b
     int last -> c
@@ -86240,7 +86867,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.UT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.pU:
     java.lang.Object[] a -> b
     int size -> c
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
@@ -86279,17 +86906,17 @@
     1:2:boolean remove(java.lang.Object):154 -> remove
     3:7:boolean remove(java.lang.Object):156: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.TT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.oU:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet this$0 -> c
     int next -> b
     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.VT:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.YT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.qU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.tU:
     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.WT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.rU:
     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.ObjectBidirectionalIterator com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection.iterator():55:55 -> iterator
@@ -86299,7 +86926,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.XT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.sU:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> b
     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
@@ -86321,9 +86948,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.ZT:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.uU:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.bU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.wU:
     java.lang.Object[] key -> b
     float f -> h
     int maxFill -> f
@@ -86339,9 +86966,19 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.size():380:380 -> addAll
     4:4:boolean addAll(java.util.Collection):258 -> addAll
     5:5:boolean addAll(java.util.Collection):258:258 -> addAll
-    6:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.tryCapacity(long):248:249 -> addAll
-    6:7:boolean addAll(java.util.Collection):258 -> addAll
-    8:8:boolean addAll(java.util.Collection):261:261 -> addAll
+    6:6:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.tryCapacity(long):248:248 -> addAll
+    6:6:boolean addAll(java.util.Collection):258 -> addAll
+    7:7:boolean addAll(java.util.Collection):0:0 -> addAll
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10,"2":11,"3":12}}
+    10:10:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.tryCapacity(long):248:248 -> addAll
+    10:10:boolean addAll(java.util.Collection):258 -> addAll
+    11:11:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.tryCapacity(long):248:248 -> addAll
+    11:11:boolean addAll(java.util.Collection):258 -> addAll
+    12:12:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.tryCapacity(long):248:248 -> addAll
+    12:12:boolean addAll(java.util.Collection):258 -> addAll
+    8:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.tryCapacity(long):249:249 -> addAll
+    8:8:boolean addAll(java.util.Collection):258 -> addAll
+    9:9:boolean addAll(java.util.Collection):261:261 -> addAll
     1:4:void clear():372:375 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet.clone():640:645 -> clone
     1:6:java.lang.Object clone():40 -> clone
@@ -86368,7 +87005,7 @@
     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$SetIterator -> com.android.tools.r8.internal.aU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.vU:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet this$0 -> g
     boolean mustReturnNull -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> f
@@ -86387,16 +87024,16 @@
     14:22:void remove():500 -> remove
     23:24:void remove():503:504 -> remove
     25:25:void remove():496:496 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.cU:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.fU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.xU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.AU:
     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.dU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.yU:
     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.eU:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$Singleton -> com.android.tools.r8.internal.zU:
     java.lang.Object element -> b
     1:2:void <init>(java.lang.Object):96:97 -> <init>
     1:1:boolean addAll(java.util.Collection):122:122 -> addAll
@@ -86414,8 +87051,8 @@
     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.gU:
-com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.T6:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.BU:
+com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.V6:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -86423,239 +87060,243 @@
     boolean $assertionsDisabled -> g
     java.util.function.Predicate isTypeMissing -> e
     com.android.tools.r8.dex.Marker marker -> d
-    1:16:void <clinit>():80:95 -> <clinit>
-    1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker):97:104 -> <init>
+    1:16:void <clinit>():81:96 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker):98:105 -> <init>
     1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():102:102 -> a
-    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):516 -> a
+    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):528 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):515:515 -> a
+    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):527:527 -> a
     3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():102:102 -> a
-    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):518 -> a
-    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):517:524 -> a
-    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):522:522 -> a
-    13:13:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    13:13:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):332 -> a
-    14:14:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):332:332 -> a
-    15:15:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    15:15:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):332 -> a
-    16:16:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):332:332 -> a
-    17:18:void write(com.android.tools.r8.ClassFileConsumer):112:113 -> a
-    19:24:void write(com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.utils.AndroidApp):117:122 -> a
-    25:25:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):222:222 -> a
+    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):530 -> a
+    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):529:536 -> a
+    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):534:534 -> a
+    13:13:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    13:13:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344 -> a
+    14:14:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344:344 -> a
+    15:15:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    15:15:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344 -> a
+    16:16:int compareTypesThroughLens(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):344:344 -> a
+    17:18:void write(com.android.tools.r8.ClassFileConsumer):113:114 -> a
+    19:24:void write(com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.utils.AndroidApp):118:123 -> a
+    25:25:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):223:223 -> a
     26:26:void com.android.tools.r8.org.objectweb.asm.ClassWriter.<init>(int):229:229 -> a
-    26:26:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):222 -> a
-    27:37:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):223:233 -> a
-    38:44:java.lang.String com.android.tools.r8.jar.CfApplicationWriter.getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):394:400 -> a
-    38:44:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):233 -> a
-    45:45:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):234:234 -> a
-    46:53:com.android.tools.r8.cf.CfVersion com.android.tools.r8.jar.CfApplicationWriter.getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):370:377 -> a
-    46:53:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):235 -> a
-    54:67:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):236:249 -> a
-    68:68:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    68:68:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):252 -> a
-    69:69:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):252:252 -> a
-    70:70:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    70:70:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):253 -> a
-    71:72:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):253:254 -> a
-    73:73:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    73:73:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):254 -> a
-    74:74:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):254:254 -> a
-    75:75:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):276:276 -> a
-    75:75:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):254 -> a
+    26:26:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):223 -> a
+    27:37:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):224:234 -> a
+    38:44:java.lang.String com.android.tools.r8.jar.CfApplicationWriter.getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):406:412 -> a
+    38:44:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):234 -> a
+    45:45:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):235:235 -> a
+    46:53:com.android.tools.r8.cf.CfVersion com.android.tools.r8.jar.CfApplicationWriter.getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):382:389 -> a
+    46:53:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):236 -> a
+    54:73:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):237:256 -> a
+    74:76:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):255:257 -> a
+    77:77:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    77:77:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):260 -> a
+    78:78:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):260:260 -> a
+    79:79:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    79:79:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):261 -> a
+    80:81:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):261:262 -> a
+    82:82:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    82:82:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):262 -> a
+    83:83:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):262:262 -> a
+    84:84:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):276:276 -> a
+    84:84:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):262 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    78:81:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):279:282 -> a
-    78:81:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):254 -> a
-    82:82:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):256:256 -> a
-    83:83:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    83:83:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):258 -> a
-    84:86:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):258:260 -> a
-    87:87:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    87:87:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):261 -> a
-    88:94:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):261:267 -> a
-    95:105:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.jar.CfApplicationWriter.getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):404:414 -> a
-    95:105:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):267 -> a
-    106:107:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):269:270 -> a
-    108:108:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens() -> 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,com.android.tools.r8.SourceFileEnvironment):270 -> a
-    109:113:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):270:274 -> a
-    114:114:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    114:114:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):274 -> a
-    115:118:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):274:277 -> a
-    119:119:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    119:119:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):278 -> a
-    120:127:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):278:285 -> a
-    128:128:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
+    87:90:java.lang.String com.android.tools.r8.graph.GenericSignature$ClassSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):279:282 -> a
+    87:90:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):262 -> a
+    91:91:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):264:264 -> a
+    92:92:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    92:92:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):266 -> a
+    93:95:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):266:268 -> a
+    96:96:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    96:96:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):269 -> a
+    97:103:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):269:275 -> a
+    104:114:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.jar.CfApplicationWriter.getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):416:426 -> a
+    104:114:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):275 -> a
+    115:116:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):277:278 -> a
+    117:117:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    117:117:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):278 -> a
+    118:122:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):278:282 -> a
+    123:123:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    123:123:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):282 -> a
+    124:127:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):282:285 -> a
+    128:128:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
     128:128:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):286 -> a
-    129:129:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):286:286 -> a
-    130:130:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    130:130:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):288 -> a
-    131:133:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):288:290 -> a
-    134:134:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    134:134:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):290 -> a
-    135:135:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):290:290 -> a
-    136:136:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
-    136:136:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):290 -> a
+    129:134:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):286:291 -> a
+    135:135:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    135:135:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):292 -> a
+    136:141:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):292:297 -> a
+    142:142:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    142:142:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):298 -> a
+    143:143:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):298:298 -> a
+    144:144:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    144:144:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):300 -> a
+    145:147:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):300:302 -> a
+    148:148:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    148:148:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):302 -> a
+    149:149:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):302:302 -> a
+    150:150:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
+    150:150:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):302 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    139:142:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
-    139:142:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):290 -> a
-    143:147:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):291:295 -> a
-    148:148:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    148:148:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):296 -> a
-    149:180:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):296:327 -> a
-    181:185:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
-    181:185:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):327 -> a
-    186:186:void lambda$writeClass$0(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):310:310 -> a
-    187:187:void lambda$writeClass$2(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):328:328 -> a
-    188:194:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):341:347 -> a
-    195:198:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):345:348 -> a
-    199:199:com.android.tools.r8.graph.DexType[] lambda$compareMethodsThroughLens$3(com.android.tools.r8.graph.DexMethod):346:346 -> a
-    200:203:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):352:355 -> a
-    204:204:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
-    204:204:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):355 -> a
+    153:156:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
+    153:156:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):302 -> a
+    157:161:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):303:307 -> a
+    162:162:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    162:162:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):308 -> a
+    163:194:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):308:339 -> a
+    195:199:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):51:55 -> a
+    195:199:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):339 -> a
+    200:200:void lambda$writeClass$0(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):322:322 -> a
+    201:201:void lambda$writeClass$2(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):340:340 -> a
+    202:208:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):353:359 -> a
+    209:212:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):357:360 -> a
+    213:213:com.android.tools.r8.graph.DexType[] lambda$compareMethodsThroughLens$3(com.android.tools.r8.graph.DexMethod):358:358 -> a
+    214:217:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):364:367 -> a
+    218:218:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
+    218:218:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):367 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    205:205:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
-    205:205:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):355 -> a
-    206:206:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> a
-    207:207:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":586,"2":587,"3":588}}
-    586:586:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> a
-    587:587:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> a
-    588:588:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> a
-    563:564:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):356:357 -> a
-    565:565:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2121:2121 -> a
-    565:565:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):358 -> a
+    219:219:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
+    219:219:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):367 -> a
+    220:220:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):367:367 -> a
+    221:221:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":612,"2":613,"3":614}}
+    612:612:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):367:367 -> a
+    613:613:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):367:367 -> a
+    614:614:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):367:367 -> a
+    589:590:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):368:369 -> a
+    591:591:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2101:2101 -> a
+    591:591:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):370 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    569:569:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2125:2125 -> a
-    569:569:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):358 -> a
-    570:570: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
-    570:570:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2126 -> a
-    570:570:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):358 -> a
-    571:576:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):357:362 -> a
-    577:581:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2121:2125 -> a
-    577:581:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):362 -> a
-    582:582: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
-    582:582:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2126 -> a
-    582:582:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):362 -> a
-    583:585:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):363:365 -> a
-    589:596:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):383:390 -> a
-    597:598:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):439:440 -> a
-    599:599:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    599:599:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):443 -> a
-    600:600:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):443:443 -> a
-    601:601:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    601:601:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):444 -> a
-    602:603:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):444:445 -> a
-    604:604:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    604:604:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):445 -> a
-    605:605:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):445:445 -> a
-    606:606:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
-    606:606:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):445 -> a
+    595:595:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2105:2105 -> a
+    595:595:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):370 -> a
+    596:596: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
+    596:596:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2106 -> a
+    596:596:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):370 -> a
+    597:602:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):369:374 -> a
+    603:607:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2101:2105 -> a
+    603:607:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):374 -> a
+    608:608: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
+    608:608:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):2106 -> a
+    608:608:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):374 -> a
+    609:611:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):375:377 -> a
+    615:622:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):395:402 -> a
+    623:624:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):451:452 -> a
+    625:625:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    625:625:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):455 -> a
+    626:626:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):455:455 -> a
+    627:627:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    627:627:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):456 -> a
+    628:629:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):456:457 -> a
+    630:630:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    630:630:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):457 -> a
+    631:631:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):457:457 -> a
+    632:632:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):476:476 -> a
+    632:632:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):457 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    609:612:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
-    609:612:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):445 -> a
-    613:616:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):432:435 -> a
-    613:616:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):446 -> a
-    617:618:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):447:448 -> a
-    619:619:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$4(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):523:523 -> a
-    620:621:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):533:534 -> a
-    622:622:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    622:622:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):542 -> a
-    623:623:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):542:542 -> a
-    624:629:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):541:546 -> a
-    630:631:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):552:553 -> a
-    632:691:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):558:617 -> a
-    692:692:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):561:561 -> a
-    693:693:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    693:693:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):564 -> a
-    694:694:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):564:564 -> a
-    695:718:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):563:586 -> a
-    719:719:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    719:719:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):589 -> a
-    720:720:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):589:589 -> a
-    721:721:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    721:721:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):590 -> a
-    722:722:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):590:590 -> a
-    723:733:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):587:597 -> a
-    734:734:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):594:594 -> a
-    735:735:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> a
-    735:735:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):613 -> a
-    736:736:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):613:613 -> a
-    737:737:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):612:612 -> a
-    738:738:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):610:610 -> a
-    739:739:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):606:606 -> a
-    740:743:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):600:603 -> a
-    1:1:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> b
-    1:1:com.android.tools.r8.graph.DexString returnTypeThroughLens(com.android.tools.r8.graph.DexMethod):336 -> b
-    2:2:com.android.tools.r8.graph.DexString returnTypeThroughLens(com.android.tools.r8.graph.DexMethod):336:336 -> b
-    3:10:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):138:145 -> b
-    11:20:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):140:149 -> b
-    21:24:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):126:129 -> b
-    21:24:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):149 -> b
+    635:638:java.lang.String com.android.tools.r8.graph.GenericSignature$FieldTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):479:482 -> a
+    635:638:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):457 -> a
+    639:642:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):444:447 -> a
+    639:642:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):458 -> a
+    643:644:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):459:460 -> a
+    645:645:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$4(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):535:535 -> a
+    646:647:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):545:546 -> a
+    648:648:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    648:648:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):554 -> a
+    649:649:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):554:554 -> a
+    650:655:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):553:558 -> a
+    656:657:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):564:565 -> a
+    658:717:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):570:629 -> a
+    718:718:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):573:573 -> a
+    719:719:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    719:719:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):576 -> a
+    720:720:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):576:576 -> a
+    721:744:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):575:598 -> a
+    745:745:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    745:745:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):601 -> a
+    746:746:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):601:601 -> a
+    747:747:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    747:747:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):602 -> a
+    748:748:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):602:602 -> a
+    749:759:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):599:609 -> a
+    760:760:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):606:606 -> a
+    761:761:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> a
+    761:761:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):625 -> a
+    762:762:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):625:625 -> a
+    763:763:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):624:624 -> a
+    764:764:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):622:622 -> a
+    765:765:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):618:618 -> a
+    766:769:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):612:615 -> a
+    1:1:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> b
+    1:1:com.android.tools.r8.graph.DexString returnTypeThroughLens(com.android.tools.r8.graph.DexMethod):348 -> b
+    2:2:com.android.tools.r8.graph.DexString returnTypeThroughLens(com.android.tools.r8.graph.DexMethod):348:348 -> b
+    3:10:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):139:146 -> b
+    11:20:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):141:150 -> b
+    21:24:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):127:130 -> b
+    21:24:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
     25:25:boolean com.android.tools.r8.dex.Marker.isCfBackend():228:228 -> b
-    25:25:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):129 -> b
-    25:25:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):149 -> b
+    25:25:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):130 -> b
+    25:25:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
     26:26:boolean com.android.tools.r8.dex.Marker.isDexBackend():232:232 -> b
-    26:26:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):129 -> b
-    26:26:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):149 -> b
-    27:28:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):129:130 -> b
-    27:28:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):149 -> b
+    26:26:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):130 -> b
+    26:26:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
+    27:28:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):130:131 -> b
+    27:28:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
     29:29:boolean com.android.tools.r8.dex.Marker.isCfBackend():228:228 -> b
-    29:29:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):131 -> b
-    29:29:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):149 -> b
-    30:30:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):131:131 -> b
-    30:30:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):149 -> b
-    31:62:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):149:180 -> b
-    63:63:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):189:189 -> b
+    29:29:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):132 -> b
+    29:29:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
+    30:30:boolean com.android.tools.r8.jar.CfApplicationWriter.includeMarker(com.android.tools.r8.dex.Marker):132:132 -> b
+    30:30:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150 -> b
+    31:62:void writeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.ClassFileConsumer):150:181 -> b
+    63:63:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):190:190 -> b
     64:64:boolean com.android.tools.r8.synthesis.SyntheticNaming.verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):428:428 -> b
-    64:64:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):189 -> b
-    65:77:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):191:203 -> b
-    78:78:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> b
-    78:78:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):207 -> b
+    64:64:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):190 -> b
+    65:77:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):192:204 -> b
+    78:78:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> b
+    78:78:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):208 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    79:81:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):209:211 -> b
-    82:86:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):208:212 -> b
-    87:87:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):205:205 -> b
-    88:89:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):193:194 -> b
-    90:90:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> b
-    90:90:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):198 -> b
+    79:81:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):210:212 -> b
+    82:86:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):209:213 -> b
+    87:87:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):206:206 -> b
+    88:89:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):194:195 -> b
+    90:90:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> b
+    90:90:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):199 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    91:92:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):199:200 -> b
-    93:93:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):196:196 -> b
-    94:94: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):313:313 -> b
-    1:2: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):460:461 -> c
-    3:3:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> c
-    3:3: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):462 -> c
-    4:5: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):463:464 -> c
+    91:92:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):200:201 -> b
+    93:93:void writeClassCatchingErrors(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional,com.android.tools.r8.SourceFileEnvironment):197:197 -> b
+    94:94: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):325:325 -> b
+    1:2: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):472:473 -> c
+    3:3:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> c
+    3:3: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):474 -> c
+    4:5: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):475:476 -> c
     6:6:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():255:255 -> c
-    6:6: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):465 -> c
-    7:10: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):468:471 -> c
+    6:6: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):477 -> c
+    7:10: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):480:483 -> c
     11:11:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):878:878 -> c
-    11:11: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):471 -> c
+    11:11: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):483 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:17:java.lang.String com.android.tools.r8.graph.GenericSignature$MethodTypeSignature.toRenamedString(com.android.tools.r8.naming.NamingLens,java.util.function.Predicate):881:884 -> c
-    14:17: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):471 -> c
-    18:18: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):472:472 -> c
-    19:26:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):418:425 -> c
-    19:26: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):472 -> c
-    27:27:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():108:108 -> c
-    27:27:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):426 -> c
-    27:27: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):472 -> c
-    28:28:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):426:426 -> c
-    28:28: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):472 -> c
-    29:37: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):473:481 -> c
-    38:51:void com.android.tools.r8.jar.CfApplicationWriter.writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):491:504 -> c
-    38:51: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):481 -> c
-    52:54: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):482:484 -> c
-    55:59: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):628:632 -> c
-    55:59: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):485 -> c
-com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.S6:
+    14:17: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):483 -> c
+    18:18: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):484:484 -> c
+    19:26:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):430:437 -> c
+    19:26: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):484 -> c
+    27:27:com.android.tools.r8.naming.NamingLens com.android.tools.r8.jar.CfApplicationWriter.getNamingLens():109:109 -> c
+    27:27:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):438 -> c
+    27:27: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):484 -> c
+    28:28:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):438:438 -> c
+    28:28: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):484 -> c
+    29:37: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):485:493 -> c
+    38:51:void com.android.tools.r8.jar.CfApplicationWriter.writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):503:516 -> c
+    38:51: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):493 -> c
+    52:54: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):494:496 -> c
+    55:59: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):640:644 -> c
+    55:59: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):497 -> c
+com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.U6:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
-com.android.tools.r8.jetbrains.kotlin.DeprecationLevel$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Gf:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Kf:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.FC:
+com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.LC:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
 com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.jetbrains.kotlin.a:
     1:38: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):0:37 -> a
@@ -86678,12 +87319,14 @@
     2:2: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):21 -> b
     2:2:com.android.tools.r8.jetbrains.kotlin.Lazy lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
+com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt -> com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt:
+# {"id":"sourceFile","fileName":"LazyJVM.kt"}
 com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.jetbrains.kotlin.b:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.jJ:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.qJ:
 # {"id":"sourceFile","fileName":"NoWhenBranchMatchedException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.CN:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.TN:
 # {"id":"sourceFile","fileName":"Tuples.kt"}
     java.lang.Object first -> b
     java.lang.Object second -> c
@@ -86715,19 +87358,27 @@
     1:1:boolean 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.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.h30:
+com.android.tools.r8.jetbrains.kotlin.TuplesKt -> com.android.tools.r8.jetbrains.kotlin.TuplesKt:
+# {"id":"sourceFile","fileName":"Tuples.kt"}
+com.android.tools.r8.jetbrains.kotlin.UByte -> com.android.tools.r8.jetbrains.kotlin.UByte:
+# {"id":"sourceFile","fileName":"UByte.kt"}
+com.android.tools.r8.jetbrains.kotlin.UInt -> com.android.tools.r8.jetbrains.kotlin.UInt:
+# {"id":"sourceFile","fileName":"UInt.kt"}
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.D30:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE INSTANCE -> a
     1:1:void <init>():71:71 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.n30:
+com.android.tools.r8.jetbrains.kotlin.UShort -> com.android.tools.r8.jetbrains.kotlin.UShort:
+# {"id":"sourceFile","fileName":"UShort.kt"}
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.J30:
 # {"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.q30:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.M30:
 # {"id":"sourceFile","fileName":"Unit.kt"}
     com.android.tools.r8.jetbrains.kotlin.Unit INSTANCE -> a
     1:1:void <init>():22:22 -> <init>
     1:1:java.lang.String toString():23:23 -> toString
-com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.L30:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.h40:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> b
     java.lang.Object _value -> c
@@ -86736,7 +87387,9 @@
     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.y60:
+com.android.tools.r8.jetbrains.kotlin.UnsignedKt -> com.android.tools.r8.jetbrains.kotlin.UnsignedKt:
+# {"id":"sourceFile","fileName":"UnsignedUtils.kt"}
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.U60:
 # {"id":"sourceFile","fileName":"AssertionsJVM.kt"}
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -86853,6 +87506,8 @@
       # {"id":"com.android.tools.r8.synthesized"}
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt__ArraysKt -> com.android.tools.r8.internal.B3:
 # {"id":"sourceFile","fileName":"Arrays.kt"}
+com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt -> com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt:
+# {"id":"sourceFile","fileName":"_ArraysJvm.kt"}
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysJvmKt$asList$3 -> com.android.tools.r8.internal.C3:
 # {"id":"sourceFile","fileName":"_ArraysJvm.kt"}
     int[] $this_asList -> b
@@ -86882,7 +87537,7 @@
     3:2136:int lastIndexOf(java.lang.Object):168 -> lastIndexOf
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.D3:
 # {"id":"sourceFile","fileName":"_Arrays.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.vc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt -> com.android.tools.r8.internal.yc:
     1:142:boolean com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt.addAll(java.util.Collection,java.lang.Object[]):0:141 -> a
     1:142:boolean addAll(java.util.Collection,java.lang.Object[]):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
@@ -87010,22 +87665,28 @@
     1327:1327:java.lang.Iterable com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.withIndex(java.lang.Iterable):1628:1628 -> b
     1327:1327:java.lang.Iterable withIndex(java.lang.Iterable):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.wc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt -> com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsJVMKt:
+# {"id":"sourceFile","fileName":"CollectionsJVM.kt"}
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__CollectionsKt -> com.android.tools.r8.internal.zc:
 # {"id":"sourceFile","fileName":"Collections.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.xc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IterablesKt -> com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IterablesKt:
+# {"id":"sourceFile","fileName":"Iterables.kt"}
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__IteratorsJVMKt -> com.android.tools.r8.internal.Ac:
 # {"id":"sourceFile","fileName":"IteratorsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.yc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsJVMKt -> com.android.tools.r8.internal.Bc:
 # {"id":"sourceFile","fileName":"MutableCollectionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__ReversedViewsKt -> com.android.tools.r8.internal.zc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt -> com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__MutableCollectionsKt:
+# {"id":"sourceFile","fileName":"MutableCollections.kt"}
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt__ReversedViewsKt -> com.android.tools.r8.internal.Cc:
 # {"id":"sourceFile","fileName":"ReversedViews.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.Bc:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt -> com.android.tools.r8.internal.Ec:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.Ac:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.Dc:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
     java.lang.Iterable $this_withIndex -> b
     1:1:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1.invoke():1628:1628 -> a
     1:1:java.lang.Object invoke():1628 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.Ci:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.Gi:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator INSTANCE -> b
     1:1:void <init>():15:15 -> <init>
@@ -87039,7 +87700,7 @@
     1:1:void set(java.lang.Object):15:15 -> set
     2:2:void com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator.set(java.lang.Void):0:0 -> set
     2:2:void set(java.lang.Object):15 -> set
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.Di:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.Hi:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyList INSTANCE -> b
     1:1:void <init>():24:24 -> <init>
@@ -87074,7 +87735,7 @@
     2:2:java.lang.Object set(int,java.lang.Object):24 -> set
     1:1:java.util.List subList(int,int):49:49 -> subList
     1:1:java.lang.String toString():29:29 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.Ei:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.Ii:
 # {"id":"sourceFile","fileName":"Maps.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap INSTANCE -> b
     1:1:void <init>():14:14 -> <init>
@@ -87091,7 +87752,7 @@
     1:1:java.lang.Object remove(java.lang.Object):14 -> remove
     1:1:java.lang.String toString():19:19 -> toString
     1:1:java.util.Collection values():14:14 -> values
-com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.Hi:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.Li:
 # {"id":"sourceFile","fileName":"Sets.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptySet INSTANCE -> b
     1:1:void <init>():14:14 -> <init>
@@ -87105,7 +87766,7 @@
     1:1:boolean equals(java.lang.Object):17:17 -> equals
     1:1:java.util.Iterator iterator():26:26 -> iterator
     1:1:java.lang.String toString():19:19 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.Xp:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.cq:
 # {"id":"sourceFile","fileName":"IndexedValue.kt"}
     java.lang.Object value -> b
     int index -> a
@@ -87118,12 +87779,12 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.Yp:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.dq:
 # {"id":"sourceFile","fileName":"Iterables.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 iteratorFactory -> b
     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.Zp:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.eq:
 # {"id":"sourceFile","fileName":"Iterators.kt"}
     java.util.Iterator iterator -> b
     int index -> c
@@ -87131,7 +87792,7 @@
     1:1:boolean hasNext():40:40 -> hasNext
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator.next():41:41 -> next
     1:1:java.lang.Object next():38 -> next
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt -> com.android.tools.r8.internal.AF:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt -> com.android.tools.r8.internal.HF:
     int mapCapacity(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
     1:4:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):547:550 -> a
@@ -87152,11 +87813,17 @@
     36:36:java.util.Map com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt.toMap(java.lang.Iterable):548:548 -> a
     36:36:java.util.Map toMap(java.lang.Iterable):0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt -> com.android.tools.r8.internal.BF:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsJVMKt -> com.android.tools.r8.internal.IF:
 # {"id":"sourceFile","fileName":"MapsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.CF:
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt -> com.android.tools.r8.jetbrains.kotlin.collections.MapsKt__MapsKt:
+# {"id":"sourceFile","fileName":"Maps.kt"}
+com.android.tools.r8.jetbrains.kotlin.collections.MapsKt___MapsKt -> com.android.tools.r8.internal.JF:
 # {"id":"sourceFile","fileName":"_Maps.kt"}
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.pP:
+com.android.tools.r8.jetbrains.kotlin.collections.SetsKt__SetsJVMKt -> com.android.tools.r8.jetbrains.kotlin.collections.SetsKt__SetsJVMKt:
+# {"id":"sourceFile","fileName":"SetsJVM.kt"}
+com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt -> com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt:
+# {"id":"sourceFile","fileName":"Comparisons.kt"}
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.HP:
 # {"id":"sourceFile","fileName":"progressionUtil.kt"}
     1:1:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.mod(int,int):10:10 -> a
     1:1:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21 -> a
@@ -87165,60 +87832,60 @@
     2:2:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21 -> a
     2:2:int getProgressionLastElement(int,int,int):47 -> a
     3:3:int getProgressionLastElement(int,int,int):48:48 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.Dx:
+com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt -> com.android.tools.r8.internal.Jx:
 # {"id":"sourceFile","fileName":"JvmClassMapping.kt"}
     1:4:java.lang.Class getJavaObjectType(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):58:61 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.Sl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.Xl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.Ul:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.Zl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke(java.lang.Object) -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function10 -> com.android.tools.r8.internal.Tl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function10 -> com.android.tools.r8.internal.Yl:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function11 -> com.android.tools.r8.internal.Vl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function11 -> com.android.tools.r8.internal.am:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function12 -> com.android.tools.r8.internal.Wl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function12 -> com.android.tools.r8.internal.bm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function13 -> com.android.tools.r8.internal.Xl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function13 -> com.android.tools.r8.internal.cm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function14 -> com.android.tools.r8.internal.Yl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function14 -> com.android.tools.r8.internal.dm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function15 -> com.android.tools.r8.internal.Zl:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function15 -> com.android.tools.r8.internal.em:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function16 -> com.android.tools.r8.internal.am:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function16 -> com.android.tools.r8.internal.fm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function17 -> com.android.tools.r8.internal.bm:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function17 -> com.android.tools.r8.internal.gm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function18 -> com.android.tools.r8.internal.cm:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function18 -> com.android.tools.r8.internal.hm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function19 -> com.android.tools.r8.internal.dm:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function19 -> com.android.tools.r8.internal.im:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.im:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.nm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function20 -> com.android.tools.r8.internal.fm:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function20 -> com.android.tools.r8.internal.km:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function21 -> com.android.tools.r8.internal.gm:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function21 -> com.android.tools.r8.internal.lm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function22 -> com.android.tools.r8.internal.hm:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function22 -> com.android.tools.r8.internal.mm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function3 -> com.android.tools.r8.internal.jm:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function3 -> com.android.tools.r8.internal.om:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function4 -> com.android.tools.r8.internal.km:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function4 -> com.android.tools.r8.internal.pm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function5 -> com.android.tools.r8.internal.lm:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function5 -> com.android.tools.r8.internal.qm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function6 -> com.android.tools.r8.internal.mm:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function6 -> com.android.tools.r8.internal.rm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function7 -> com.android.tools.r8.internal.nm:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function7 -> com.android.tools.r8.internal.sm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function8 -> com.android.tools.r8.internal.om:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function8 -> com.android.tools.r8.internal.tm:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.pm:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function9 -> com.android.tools.r8.internal.um:
 # {"id":"sourceFile","fileName":"Functions.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.X9:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassBasedDeclarationContainer -> com.android.tools.r8.internal.aa:
 # {"id":"sourceFile","fileName":"ClassBasedDeclarationContainer.kt"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.gb:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.jb:
 # {"id":"sourceFile","fileName":"ClassReference.kt"}
     java.util.Map FUNCTION_CLASSES -> b
     java.lang.Class jClass -> a
@@ -87249,7 +87916,7 @@
     2:2:java.lang.String toString():97:97 -> toString
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.stringPlus(java.lang.String,java.lang.Object):20:20 -> toString
     3:3:java.lang.String toString():97 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.rc:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.uc:
 # {"id":"sourceFile","fileName":"CollectionToArray.kt"}
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():127:127 -> <clinit>
@@ -87263,7 +87930,7 @@
     251:316:java.lang.Object[] toArray(java.util.Collection):21:86 -> a
     317:399:java.lang.Object[] toArray(java.util.Collection):22:104 -> a
     400:400:java.lang.Object[] toArray(java.util.Collection):23:23 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.Rv:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.Xv:
     1:1:void throwUninitializedPropertyAccessException(java.lang.String):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3,"2":4,"3":5,"4":6,"5":7,"6":8}}
     3:3:void throwUninitializedPropertyAccessException(java.lang.String):58:58 -> a
@@ -87296,7 +87963,7 @@
     2:13:void checkNotNullParameter(java.lang.Object,java.lang.String):131 -> b
     14:14:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullNPE(java.lang.String):140:140 -> b
     14:14:void checkNotNullParameter(java.lang.Object,java.lang.String):131 -> b
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics$$ExternalSyntheticCheckNotZero0 -> com.android.tools.r8.internal.Qv:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics$$ExternalSyntheticCheckNotZero0 -> com.android.tools.r8.internal.Wv:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     1:1:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullNPE(java.lang.String):140:140 -> a
@@ -87309,11 +87976,11 @@
     14:14:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullNPE(java.lang.String):140:140 -> a
     14:14:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.checkNotNullParameter(java.lang.Object,java.lang.String):131 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.qC:
 # {"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.Reflection -> com.android.tools.r8.internal.jU:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.EU:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory factory -> a
     1:9:void <clinit>():26:34 -> <clinit>
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):59:59 -> a
@@ -87323,11 +87990,11 @@
     4:5:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.FunctionBase):44:45 -> a
     4:5:java.lang.String com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):39 -> a
     4:5:java.lang.String renderLambdaToString(com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda):78 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.kU:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.FU:
     1:1:void <init>():14:14 -> <init>
-com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.Gy:
+com.android.tools.r8.jetbrains.kotlin.reflect.KClass -> com.android.tools.r8.internal.My:
 # {"id":"sourceFile","fileName":"KClass.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.LZ:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.g00:
     1:71:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace(java.lang.String,char,char,boolean):0:70 -> a
     1:71:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):68 -> a
     1:71:java.lang.String replace$default(java.lang.String,char,char,boolean,int,java.lang.Object):0 -> a
@@ -87355,15 +88022,19 @@
     4:4:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substringAfterLast$default(java.lang.String,char,java.lang.String,int,java.lang.Object):483 -> b
     4:4:java.lang.String substringAfterLast$default(java.lang.String,char,java.lang.String,int,java.lang.Object):0 -> b
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.MZ:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__AppendableKt -> com.android.tools.r8.jetbrains.kotlin.text.StringsKt__AppendableKt:
+# {"id":"sourceFile","fileName":"Appendable.kt"}
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__IndentKt -> com.android.tools.r8.internal.h00:
 # {"id":"sourceFile","fileName":"Indent.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.NZ:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsKt -> com.android.tools.r8.internal.i00:
 # {"id":"sourceFile","fileName":"RegexExtensions.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.OZ:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt -> com.android.tools.r8.internal.j00:
 # {"id":"sourceFile","fileName":"StringBuilder.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsKt -> com.android.tools.r8.internal.PZ:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsKt -> com.android.tools.r8.internal.k00:
 # {"id":"sourceFile","fileName":"StringNumberConversions.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.QZ:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt:
+# {"id":"sourceFile","fileName":"StringsJVM.kt"}
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt -> com.android.tools.r8.internal.l00:
 # {"id":"sourceFile","fileName":"Strings.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 contains$default(java.lang.CharSequence,char,boolean,int,java.lang.Object):1158 -> a
@@ -87395,9 +88066,11 @@
     1108:1108:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):418:418 -> a
     1109:1111:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.regionMatches(java.lang.String,int,java.lang.String,int,int,boolean):654:656 -> a
     1109:1111:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt.startsWith(java.lang.String,java.lang.String,boolean):420 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsKt -> com.android.tools.r8.internal.RZ:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsKt -> com.android.tools.r8.internal.m00:
 # {"id":"sourceFile","fileName":"_Strings.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.ll:
+com.android.tools.r8.jetbrains.kotlinx.metadata.ClassNameKt -> com.android.tools.r8.jetbrains.kotlinx.metadata.ClassNameKt:
+# {"id":"sourceFile","fileName":"ClassName.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.ql:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     int bitWidth -> b
     int value -> c
@@ -87408,31 +88081,31 @@
     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$Property -> com.android.tools.r8.internal.il:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Property -> com.android.tools.r8.internal.nl:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag HAS_GETTER -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag HAS_SETTER -> b
     1:79:void <clinit>():343:421 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.jl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.ol:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_NULLABLE -> a
     1:7:void <clinit>():455:461 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.kl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.pl:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_REIFIED -> a
     1:1:void <clinit>():472:472 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.ll$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.ql$a:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag DECLARES_DEFAULT_VALUE -> a
     1:13:void <clinit>():486:498 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt -> com.android.tools.r8.internal.sl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt -> com.android.tools.r8.internal.xl:
 # {"id":"sourceFile","fileName":"Flags.kt"}
     1:1:int flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):28:28 -> a
     2:2:int flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):25:25 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.Tp:
+com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.Yp:
 # {"id":"sourceFile","fileName":"InconsistentKotlinMetadataException.kt"}
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.Hy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.Ny:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.Map arguments -> b
     java.lang.String className -> a
@@ -87445,10 +88118,10 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.Jy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.Py:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.Iy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.Oy:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation annotation -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):65:65 -> <init>
@@ -87459,7 +88132,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0: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.Jy$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.Py$a:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.List elements -> a
     1:1:void <init>(java.util.List):66:66 -> <init>
@@ -87470,7 +88143,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.Ky:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.Qy:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     boolean value -> a
     1:1:void <init>(boolean):44:44 -> <init>
@@ -87495,7 +88168,7 @@
     2:2:java.lang.Boolean com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue.getValue():44:44 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.Ly:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.Ry:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):37:37 -> <init>
@@ -87516,7 +88189,7 @@
     2:2:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue.getValue():37:37 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.My:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.Sy:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     char value -> a
     1:1:void <init>(char):38:38 -> <init>
@@ -87541,7 +88214,7 @@
     2:2:java.lang.Character com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue.getValue():38:38 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.Ny:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.Ty:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     double value -> a
     1:1:void <init>(double):43:43 -> <init>
@@ -87565,7 +88238,7 @@
     2:2:java.lang.Double com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue.getValue():43:43 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.Oy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.Uy:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String enumClassName -> a
     java.lang.String enumEntryName -> b
@@ -87578,7 +88251,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.Py:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.Vy:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     float value -> a
     1:1:void <init>(float):42:42 -> <init>
@@ -87602,7 +88275,7 @@
     2:2:java.lang.Float com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue.getValue():42:42 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.Qy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.Wy:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):40:40 -> <init>
@@ -87627,7 +88300,7 @@
     2:2:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue.getValue():40:40 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.Ry:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.Xy:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String className -> a
     int arrayDimensionCount -> b
@@ -87640,10 +88313,10 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LiteralValue -> com.android.tools.r8.internal.Sy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LiteralValue -> com.android.tools.r8.internal.Yy:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     1:1:void <init>():30:30 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.Ty:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.Zy:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):41:41 -> <init>
@@ -87668,7 +88341,7 @@
     2:2:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue.getValue():41:41 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.Uy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.az:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):39:39 -> <init>
@@ -87693,7 +88366,7 @@
     2:2:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue.getValue():39:39 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.Vy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.bz:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):59:59 -> <init>
@@ -87715,7 +88388,7 @@
     2:2:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue.getValue():59:59 -> toString
     2:2:java.lang.String toString():0 -> toString
     3:3:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.Wy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.cz:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):48:48 -> <init>
@@ -87737,7 +88410,7 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.UByte.toString-impl(byte):343:343 -> toString
     3:3:java.lang.String toString():0 -> toString
     4:4:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.Xy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.dz:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):54:54 -> <init>
@@ -87759,7 +88432,7 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.UInt.toString-impl(int):365:365 -> toString
     3:3:java.lang.String toString():0 -> toString
     4:4:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.Yy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.ez:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):57:57 -> <init>
@@ -87788,7 +88461,7 @@
     12:12:java.lang.String com.android.tools.r8.jetbrains.kotlin.ULong.toString-impl(long):368 -> toString
     12:12:java.lang.String toString():0 -> toString
     13:13:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.Zy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.fz:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):51:51 -> <init>
@@ -87810,7 +88483,7 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlin.UShort.toString-impl(short):344:344 -> toString
     3:3:java.lang.String toString():0 -> toString
     4:4:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.az:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.gz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> q
     java.util.List versionRequirements -> p
@@ -87897,9 +88570,9 @@
     1:1:java.util.List getTypeParameters():49:49 -> p
     1:1:java.util.List getVersionRequirements():109:109 -> q
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():161:161 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.cz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.iz:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.dz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.jz:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):57:57 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):57:57 -> <init>
@@ -87907,10 +88580,10 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor.getDelegate():59:59 -> e
     1:1:void visitEnd():170 -> e
     2:2:void visitEnd():170:170 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.fz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.lz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     1:1:void <init>():972:972 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.ez:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.kz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):978:978 -> <init>
@@ -87921,7 +88594,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.fz$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.lz$a:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):993:993 -> <init>
@@ -87932,7 +88605,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.fz$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.lz$b:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int id -> a
     1:1:void <init>(int):985:985 -> <init>
@@ -87943,7 +88616,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.gz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.mz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Object value -> a
     1:1:void <init>(java.lang.Object):1042:1042 -> <init>
@@ -87954,7 +88627,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.hz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.nz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> e
     java.util.List versionRequirements -> d
@@ -87974,9 +88647,9 @@
     1:1:int getFlags():307:307 -> c
     1:1:java.util.List getValueParameters():311:311 -> d
     1:1:java.util.List getVersionRequirements():316:316 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.jz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.pz:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.kz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.qz:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):263:263 -> <init>
@@ -87985,7 +88658,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String) -> a
     1:1:void visitEnd():291:291 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.lz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.rz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List effects -> b
     1:5:void <init>():832:836 -> <init>
@@ -87993,19 +88666,19 @@
     2:205:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):847:847 -> a
     206:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):848:848 -> a
     1:1:java.util.List getEffects():836:836 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.mz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.sz:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):732:732 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):732:732 -> <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):741:741 -> a
     2:2:void visitEnd():747:747 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.nz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.tz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List getFunctions() -> a
     java.util.List getProperties() -> b
     java.util.List getTypeAliases() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.oz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.uz:
 # {"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>
@@ -88013,7 +88686,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.pz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.vz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List constructorArguments -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType type -> b
@@ -88029,7 +88702,7 @@
     1:1:java.util.List getConstructorArguments():870:870 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind getInvocationKind():864:864 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType getType():863:863 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.qz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.wz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer parameterIndex -> c
     java.util.List andArguments -> f
@@ -88052,7 +88725,7 @@
     1:1:java.util.List getOrArguments():933:933 -> g
     1:1:java.lang.Integer getParameterIndex():911:911 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType isInstanceType():921:921 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.rz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.xz:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):791:791 -> <init>
@@ -88063,7 +88736,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():825:825 -> a
     1:1:void visitEnd():838:838 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.sz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.yz:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_MOST_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_LEAST_ONCE -> d
@@ -88075,7 +88748,7 @@
     5:5:void <clinit>():884:884 -> <clinit>
     1:1:void <init>(java.lang.String,int):881:881 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind[] values() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.tz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.zz:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_CONSTANT -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_NOT_NULL -> d
@@ -88087,7 +88760,7 @@
     5:5:void <clinit>():872:872 -> <clinit>
     1:1:void <init>(java.lang.String,int):869:869 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType[] values() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.uz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.Az:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):760:760 -> <init>
@@ -88095,7 +88768,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():773:773 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():766:766 -> b
     1:1:void visitEnd():779:779 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.wz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.Cz:
 # {"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>
@@ -88107,9 +88780,9 @@
     2:30:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaClass(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):0:28 -> toString
     2:30:java.lang.String toString():39 -> toString
     31:31:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.xz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.Dz:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.yz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.Ez:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> a
     java.lang.String typeFlexibilityId -> b
@@ -88122,7 +88795,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.zz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.Fz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List valueParameters -> f
     java.util.List typeParameters -> d
@@ -88161,9 +88834,9 @@
     1:1:java.util.List getTypeParameters():356:356 -> i
     1:1:java.util.List getValueParameters():366:366 -> j
     1:1:java.util.List getVersionRequirements():376:376 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.Bz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.Hz:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.Cz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.Iz:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):301:301 -> <init>
@@ -88176,21 +88849,21 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):337:337 -> b
     2:2:void visitEnd():363:363 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():343:343 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.Dz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.Jz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction function -> b
     1:1:void <init>():282:282 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):289:289 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.setFunction(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):286:286 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):289 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.Ez:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.Kz:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):240:240 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):240:240 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):248:248 -> a
     2:2:void visitEnd():254:254 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.Fz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.Lz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List functions -> b
     java.util.List extensions -> e
@@ -88230,9 +88903,9 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):220 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):220:220 -> b
     1:1:java.util.List getTypeAliases():208:208 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.Hz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.Nz:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.Iz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.Oz:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):179:179 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):179:179 -> <init>
@@ -88240,7 +88913,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.getDelegate():181:181 -> e
     1:1:void visitEnd():195 -> e
     2:2:void visitEnd():195:195 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.Jz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.Pz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter setterParameter -> h
@@ -88279,9 +88952,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter getSetterParameter():453:453 -> i
     1:1:java.util.List getTypeParameters():443:443 -> j
     1:1:java.util.List getVersionRequirements():463:463 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.Lz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.Rz:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.Mz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.Sz:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):373:373 -> <init>
@@ -88293,7 +88966,7 @@
     5:5:void visitEnd():429:429 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):409:409 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():415:415 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.Nz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.Tz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier classifier -> c
@@ -88339,7 +89012,7 @@
     1:1:int getFlags():668:668 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound getFlexibleTypeUpperBound():707:707 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getOuterType():700:700 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.Oz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.Uz:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType expandedType -> f
@@ -88393,9 +89066,9 @@
     1:1:java.lang.String getName():510:510 -> e
     1:1:java.util.List getTypeParameters():515:515 -> f
     1:1:java.util.List getVersionRequirements():536:536 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor -> com.android.tools.r8.internal.Qz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor -> com.android.tools.r8.internal.Wz:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.Rz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.Xz:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):439:439 -> <init>
@@ -88407,9 +89080,9 @@
     4:4:void visitEnd():496:496 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):458:458 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():482:482 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.Tz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.Zz:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.Uz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.aA:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List upperBounds -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> e
@@ -88432,9 +89105,9 @@
     1:1:java.lang.String getName():633:633 -> d
     1:1:java.util.List getUpperBounds():640:640 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():635:635 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Wz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.cA:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.Xz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.dA:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):544:544 -> <init>
@@ -88442,7 +89115,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):551:551 -> a
     2:2:void visitEnd():565:565 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.Yz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.eA:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> a
@@ -88459,7 +89132,7 @@
     4:4:java.lang.String toString():0:0 -> toString
     5:5:java.lang.String toString():0:0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.Zz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.fA:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):580:580 -> <init>
@@ -88474,7 +89147,7 @@
     2:2:void visitStarProjection():624:624 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):654:654 -> b
     1:1:void visitTypeParameter(int):606:606 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.aA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.gA:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> d
@@ -88496,9 +89169,9 @@
     1:1:java.lang.String getName():584:584 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():590:590 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getVarargElementType():595:595 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor -> com.android.tools.r8.internal.cA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor -> com.android.tools.r8.internal.iA:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.dA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.jA:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):506:506 -> <init>
@@ -88507,14 +89180,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):513:513 -> a
     2:2:void visitEnd():535:535 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):521:521 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.eA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.kA:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance INVARIANT -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance OUT -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance IN -> c
     1:11:void <clinit>():850:860 -> <clinit>
     1:1:void <init>(java.lang.String,int):846:846 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.fA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.lA:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int minor -> b
     int patch -> c
@@ -88524,7 +89197,7 @@
     1:1:int getMinor():1030:1030 -> b
     1:1:int getPatch():1030:1030 -> c
     1:1:java.lang.String toString():1031:1031 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.gA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.mA:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer errorCode -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
@@ -88562,21 +89235,21 @@
     21:21:void visitVersion(int,int,int):811 -> a
     1:1:java.lang.Integer getErrorCode():791:791 -> b
     1:1:java.lang.String getMessage():796:796 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.hA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.nA:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel HIDDEN -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel ERROR -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel WARNING -> b
     1:3:void <clinit>():891:893 -> <clinit>
     1:1:void <init>(java.lang.String,int):890:890 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.iA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.oA:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind COMPILER_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind API_VERSION -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind LANGUAGE_VERSION -> b
     1:3:void <clinit>():900:902 -> <clinit>
     1:1:void <init>(java.lang.String,int):899:899 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.jA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.pA:
 # {"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,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):691:691 -> <init>
@@ -88584,10 +89257,10 @@
     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():720:720 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt -> com.android.tools.r8.internal.mJ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.NodesKt -> com.android.tools.r8.internal.tJ:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     1:1:java.lang.Object addTo(java.lang.Object,java.util.Collection):1045:1045 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.Cb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.Fb:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder t -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):413:413 -> <init>
@@ -88639,63 +89312,65 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):288:288 -> h
     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 -> h
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():468 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.tb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.wb:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):431:431 -> a
     2:433: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:431 -> a
     2:433:java.lang.Object invoke(java.lang.Object):431 -> a
     434:434:java.lang.Object invoke(java.lang.Object):431:431 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.ub:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1:
+# {"id":"sourceFile","fileName":"writers.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.xb:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):434:434 -> a
     2:436: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:434 -> a
     2:436:java.lang.Object invoke(java.lang.Object):434 -> a
     437:437:java.lang.Object invoke(java.lang.Object):434:434 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitInlineClassUnderlyingType$1 -> com.android.tools.r8.internal.vb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitInlineClassUnderlyingType$1 -> com.android.tools.r8.internal.yb:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):465:465 -> a
     2:467:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitInlineClassUnderlyingType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:465 -> a
     2:467:java.lang.Object invoke(java.lang.Object):465 -> a
     468:468:java.lang.Object invoke(java.lang.Object):465:465 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.wb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.zb:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):437:437 -> a
     2:439: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:437 -> a
     2:439:java.lang.Object invoke(java.lang.Object):437 -> a
     440:440:java.lang.Object invoke(java.lang.Object):437:437 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.xb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.Ab:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):428:428 -> a
     2:430: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:428 -> a
     2:430:java.lang.Object invoke(java.lang.Object):428 -> a
     431:431:java.lang.Object invoke(java.lang.Object):428:428 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.yb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.Bb:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):440:440 -> a
     2:442: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:440 -> a
     2:442:java.lang.Object invoke(java.lang.Object):440 -> a
     443:443:java.lang.Object invoke(java.lang.Object):440:440 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.zb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.Cb:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):425:425 -> a
     2:427: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:425 -> a
     2:427:java.lang.Object invoke(java.lang.Object):425 -> a
     428:428:java.lang.Object invoke(java.lang.Object):425:425 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.Ab:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.Db:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):468:468 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1.invoke(int):468:468 -> a
     2:2:java.lang.Object invoke(java.lang.Object):468 -> a
     3:3:java.lang.Object invoke(java.lang.Object):468:468 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.CC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.IC:
 # {"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):532:534 -> <init>
@@ -88706,14 +89381,14 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):537 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():534:534 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():533:533 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.BC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.HC:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):537:537 -> a
     2:539: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:537 -> a
     2:539:java.lang.Object invoke(java.lang.Object):537 -> a
     540:540:java.lang.Object invoke(java.lang.Object):537:537 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.AN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.RN:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder t -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.util.List,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):482:482 -> <init>
@@ -88739,28 +89414,30 @@
     1:2:void visitEnd():501:502 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():484:484 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder getT():483:483 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.xN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1:
+# {"id":"sourceFile","fileName":"writers.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.ON:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):487:487 -> a
     2:489: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:487 -> a
     2:489:java.lang.Object invoke(java.lang.Object):487 -> a
     490:490:java.lang.Object invoke(java.lang.Object):487:487 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.yN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.PN:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):490:490 -> a
     2:492: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:490 -> a
     2:492:java.lang.Object invoke(java.lang.Object):490 -> a
     493:493:java.lang.Object invoke(java.lang.Object):490:490 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.zN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.QN:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):493:493 -> a
     2:495: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:493 -> a
     2:495:java.lang.Object invoke(java.lang.Object):493 -> a
     496:496:java.lang.Object invoke(java.lang.Object):493:493 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.iS:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.DS:
 # {"id":"sourceFile","fileName":"readers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable types -> b
     java.util.List contextExtensions -> e
@@ -88780,7 +89457,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable getTypes():23:23 -> c
     2:2:java.lang.Integer getTypeParameterId(int):39:39 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable getVersionRequirements$kotlinx_metadata():24:24 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.kS:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.FS:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
     1: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):18:70 -> a
     54:54: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):69:69 -> a
@@ -88819,10 +89496,10 @@
     213:213:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver.getQualifiedClassName(int):74:74 -> a
     213:213:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):57 -> a
     214:214:java.lang.String getClassName(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver,int):58:58 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt$WhenMappings -> com.android.tools.r8.internal.jS:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt$WhenMappings -> com.android.tools.r8.internal.ES:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
     int[] $EnumSwitchMapping$0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.lS:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt -> com.android.tools.r8.internal.GS:
 # {"id":"sourceFile","fileName":"readers.kt"}
     1:1:void accept$default(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,java.util.List,int,java.lang.Object):52:52 -> a
     2:59: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,java.util.List):0:57 -> a
@@ -89090,7 +89767,7 @@
     1:1:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):507:507 -> b
     2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getDefaultPropertyAccessorFlags(int):510:510 -> b
     2:2:int getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):507 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.y50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.U50:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable versionRequirements -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable strings -> a
@@ -89100,7 +89777,7 @@
     2:2:int get(java.lang.String):26:26 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable getVersionRequirements():23:23 -> b
     2:2:int getClassName(java.lang.String):29:29 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt -> com.android.tools.r8.internal.z50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt -> com.android.tools.r8.internal.V50:
 # {"id":"sourceFile","fileName":"writeUtils.kt"}
     1:6: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
     7:8: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$Builder.build():3058:3059 -> a
@@ -89125,10 +89802,10 @@
     92:92:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
     92:92: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):99 -> a
     93:96: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):101:104 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.w60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt -> com.android.tools.r8.internal.S60:
 # {"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):189:189 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.C50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.Y50:
 # {"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
@@ -89155,7 +89832,9 @@
     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():136 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder getT():130:130 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.A50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1:
+# {"id":"sourceFile","fileName":"writers.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.W50:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):133:133 -> a
@@ -89174,14 +89853,14 @@
     141:141:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():18809:18809 -> a
     141:141: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):133 -> a
     141:141:java.lang.Object invoke(java.lang.Object):133 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.B50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.X50:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):136:136 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1.invoke(int):136:136 -> a
     2:2:java.lang.Object invoke(java.lang.Object):136 -> a
     3:3:java.lang.Object invoke(java.lang.Object):136:136 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.E50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.a60:
 # {"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
@@ -89193,14 +89872,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):341 -> a
     3:3:void visitEnd():344:344 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder getT():338:338 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.D50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.Z50:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):341:341 -> a
     2:343: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:341 -> a
     2:343:java.lang.Object invoke(java.lang.Object):341 -> a
     344:344:java.lang.Object invoke(java.lang.Object):341:341 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.I50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.e60:
 # {"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
@@ -89222,10 +89901,10 @@
     15:15:void visitEnd():369:369 -> c
     16:21:void visitEnd():368:373 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder getT():352:352 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$WhenMappings -> com.android.tools.r8.internal.F50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$WhenMappings -> com.android.tools.r8.internal.b60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     int[] $EnumSwitchMapping$1 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.G50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.c60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):358:358 -> a
@@ -89244,14 +89923,14 @@
     366:366:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.build():25929:25929 -> a
     366:366: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):358 -> a
     366:366:java.lang.Object invoke(java.lang.Object):358 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.H50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.d60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):355:355 -> a
     2:357: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:355 -> a
     2:357:java.lang.Object invoke(java.lang.Object):355 -> a
     358:358:java.lang.Object invoke(java.lang.Object):355:355 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.M50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.i60:
 # {"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
@@ -89273,28 +89952,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():406 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder getT():379:379 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.J50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.f60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):403:403 -> a
     2:405: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:403 -> a
     2:405:java.lang.Object invoke(java.lang.Object):403 -> a
     406:406:java.lang.Object invoke(java.lang.Object):403:403 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.K50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.g60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):400:400 -> a
     2:402: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:400 -> a
     2:402:java.lang.Object invoke(java.lang.Object):400 -> a
     403:403:java.lang.Object invoke(java.lang.Object):400:400 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.L50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.h60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):406:406 -> a
     2:408: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:406 -> a
     2:408:java.lang.Object invoke(java.lang.Object):406 -> a
     409:409:java.lang.Object invoke(java.lang.Object):406:406 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.U50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.q60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     int $flags -> e
@@ -89329,7 +90008,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():168 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():153:153 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.N50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.j60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):171:171 -> a
@@ -89348,7 +90027,7 @@
     179:179:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23900:23900 -> a
     179:179: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):171 -> a
     179:179:java.lang.Object invoke(java.lang.Object):171 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.O50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.k60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> c
@@ -89356,42 +90035,42 @@
     1:1:java.lang.Object invoke(java.lang.Object):174:174 -> a
     2:177: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:175 -> a
     2:177:java.lang.Object invoke(java.lang.Object):174 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.P50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.l60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):159:159 -> a
     2:161: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:159 -> a
     2:161:java.lang.Object invoke(java.lang.Object):159 -> a
     162:162:java.lang.Object invoke(java.lang.Object):159:159 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.Q50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.m60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):165:165 -> a
     2:167: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:165 -> a
     2:167:java.lang.Object invoke(java.lang.Object):165 -> a
     168:168:java.lang.Object invoke(java.lang.Object):165:165 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.R50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.n60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):156:156 -> a
     2:158: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:156 -> a
     2:158:java.lang.Object invoke(java.lang.Object):156 -> a
     159:159:java.lang.Object invoke(java.lang.Object):156:156 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.S50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.o60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):162:162 -> a
     2:164: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:162 -> a
     2:164:java.lang.Object invoke(java.lang.Object):162 -> a
     165:165:java.lang.Object invoke(java.lang.Object):162:162 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.T50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.p60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):168:168 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1.invoke(int):168:168 -> a
     2:2:java.lang.Object invoke(java.lang.Object):168 -> a
     3:3:java.lang.Object invoke(java.lang.Object):168:168 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.b60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.x60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
@@ -89424,7 +90103,7 @@
     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():205 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder getT():190:190 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.V50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.r60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -89432,21 +90111,21 @@
     1:1:java.lang.Object invoke(java.lang.Object):208:208 -> a
     2:211: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:209 -> a
     2:211:java.lang.Object invoke(java.lang.Object):208 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.W50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.s60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):196:196 -> a
     2:198: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:196 -> a
     2:198:java.lang.Object invoke(java.lang.Object):196 -> a
     199:199:java.lang.Object invoke(java.lang.Object):196:196 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.X50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.t60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):202:202 -> a
     2:204: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:202 -> a
     2:204:java.lang.Object invoke(java.lang.Object):202 -> a
     205:205:java.lang.Object invoke(java.lang.Object):202:202 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.Y50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.u60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):199:199 -> a
@@ -89465,21 +90144,21 @@
     207:207:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.build():18809:18809 -> a
     207:207: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):199 -> a
     207:207:java.lang.Object invoke(java.lang.Object):199 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.Z50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.v60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):193:193 -> a
     2:195: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:193 -> a
     2:195:java.lang.Object invoke(java.lang.Object):193 -> a
     196:196:java.lang.Object invoke(java.lang.Object):193:193 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.a60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.w60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):205:205 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1.invoke(int):205:205 -> a
     2:2:java.lang.Object invoke(java.lang.Object):205 -> a
     3:3:java.lang.Object invoke(java.lang.Object):205:205 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.g60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.C60:
 # {"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
@@ -89518,14 +90197,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):101 -> b
     1:1:void visitTypeParameter(int):94:94 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.c60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.y60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):98:98 -> a
     2:100: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:98 -> a
     2:100:java.lang.Object invoke(java.lang.Object):98 -> a
     101:101:java.lang.Object invoke(java.lang.Object):98:98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.d60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.z60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance $variance -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> b
@@ -89535,7 +90214,9 @@
     92:92: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):83:83 -> a
     92:92:java.lang.Object invoke(java.lang.Object):82 -> a
     93:93:java.lang.Object invoke(java.lang.Object):82:82 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.e60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1:
+# {"id":"sourceFile","fileName":"writers.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.A60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     java.lang.String $typeFlexibilityId -> b
@@ -89544,14 +90225,14 @@
     2:110: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:108 -> a
     2:110:java.lang.Object invoke(java.lang.Object):104 -> a
     111:111:java.lang.Object invoke(java.lang.Object):104:104 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.f60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.B60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):101:101 -> a
     2:103: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:101 -> a
     2:103:java.lang.Object invoke(java.lang.Object):101 -> a
     104:104:java.lang.Object invoke(java.lang.Object):101:101 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.m60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.I60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder t -> b
     int $flags -> d
@@ -89579,14 +90260,14 @@
     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():270 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder getT():254:254 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.h60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.D60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):263:263 -> a
     2:265: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:263 -> a
     2:265:java.lang.Object invoke(java.lang.Object):263 -> a
     266:266:java.lang.Object invoke(java.lang.Object):263:263 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1 -> com.android.tools.r8.internal.i60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1 -> com.android.tools.r8.internal.E60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -89594,28 +90275,28 @@
     1:1:java.lang.Object invoke(java.lang.Object):273:273 -> a
     2:276:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:274 -> a
     2:276:java.lang.Object invoke(java.lang.Object):273 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.j60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.F60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):257:257 -> a
     2:259: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:257 -> a
     2:259:java.lang.Object invoke(java.lang.Object):257 -> a
     260:260:java.lang.Object invoke(java.lang.Object):257:257 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.k60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.G60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):260:260 -> a
     2:262: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:260 -> a
     2:262:java.lang.Object invoke(java.lang.Object):260 -> a
     263:263:java.lang.Object invoke(java.lang.Object):260:260 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.l60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.H60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):270:270 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1.invoke(int):270:270 -> a
     2:2:java.lang.Object invoke(java.lang.Object):270 -> a
     3:3:java.lang.Object invoke(java.lang.Object):270:270 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.o60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.K60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder t -> b
     int $flags -> f
@@ -89641,14 +90322,16 @@
     51:51:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):43 -> a
     52:52:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):43:43 -> a
     53:64:void visitEnd():48:59 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.n60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1:
+# {"id":"sourceFile","fileName":"writers.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.J60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):40:40 -> a
     2:42: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:40 -> a
     2:42:java.lang.Object invoke(java.lang.Object):40 -> a
     43:43:java.lang.Object invoke(java.lang.Object):40:40 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.s60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.O60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder t -> b
     int $flags -> d
@@ -89667,7 +90350,7 @@
     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):64:64 -> 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):234 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.p60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.L60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> c
@@ -89675,21 +90358,21 @@
     1:1:java.lang.Object invoke(java.lang.Object):237:237 -> a
     2:240:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:238 -> a
     2:240:java.lang.Object invoke(java.lang.Object):237 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.q60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.M60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):231:231 -> a
     2:233: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:231 -> a
     2:233:java.lang.Object invoke(java.lang.Object):231 -> a
     234:234:java.lang.Object invoke(java.lang.Object):231:231 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.r60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.N60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):234:234 -> a
     2:236: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:234 -> a
     2:236:java.lang.Object invoke(java.lang.Object):234 -> a
     237:237:java.lang.Object invoke(java.lang.Object):234:234 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.v60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.R60:
 # {"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
@@ -89712,61 +90395,61 @@
     33:36:void visitEnd():329:332 -> a
     37:37:void visitEnd():330:330 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder getT():289:289 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.t60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.P60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):322:322 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1.invoke(int):323:323 -> a
     2:2:java.lang.Object invoke(java.lang.Object):322 -> a
     3:3:java.lang.Object invoke(java.lang.Object):322:322 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.u60:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.Q60:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> b
     1:1:java.lang.Object invoke(java.lang.Object):322:322 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2.invoke(int):324:324 -> a
     2:2:java.lang.Object invoke(java.lang.Object):322 -> a
     3:3:java.lang.Object invoke(java.lang.Object):322:322 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt -> com.android.tools.r8.internal.Yj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt -> com.android.tools.r8.internal.dk:
 # {"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.bz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.hz:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.iz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.oz:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.vz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.Bz:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
     void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.Az:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.Gz:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.Gz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.Mz:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.Kz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.Qz:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeAliasExtension -> com.android.tools.r8.internal.Pz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeAliasExtension -> com.android.tools.r8.internal.Vz:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.Sz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.Yz:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.Vz:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.bA:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.bA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension -> com.android.tools.r8.internal.hA:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.dG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.kG:
 # {"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.cG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.jG:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion $$INSTANCE -> a
     com.android.tools.r8.jetbrains.kotlin.Lazy INSTANCES$delegate -> b
     1:1:void <clinit>():84:84 -> <clinit>
     1:1:void <init>():83:83 -> <init>
     1:1:java.util.List getINSTANCES():84:84 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.bG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.iG:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 INSTANCE -> b
     1:3:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2.invoke():85:87 -> a
     1:3:java.lang.Object invoke():84 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.gQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.zQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List argument_ -> e
     int memoizedSerializedSize -> g
@@ -89820,11 +90503,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.XP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.qQ:
     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.eQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.xQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument defaultInstance -> h
     int memoizedSerializedSize -> g
@@ -89871,11 +90554,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.YP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.rQ:
     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.ZP:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.sQ:
     int nameId_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> e
     int bitField0_ -> c
@@ -89926,7 +90609,7 @@
     14:14: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 -> g
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument build():3986 -> g
     15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument build():3986:3986 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.dQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.wQ:
     int flags_ -> n
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value defaultInstance -> q
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -90040,11 +90723,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.aQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.tQ:
     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.bQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.uQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type type_ -> d
     int flags_ -> n
     int arrayDimensionCount_ -> m
@@ -90118,7 +90801,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder.create():3019:3019 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder access$2100():3005 -> f
     1:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3066:3114 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.cQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.vQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] $VALUES -> p
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type BYTE -> c
@@ -90152,7 +90835,7 @@
     13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2531:2531 -> a
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2530:2530 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] values():2416:2416 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.fQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.yQ:
     java.util.List argument_ -> e
     int id_ -> d
     int bitField0_ -> c
@@ -90185,7 +90868,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.create():4348:4348 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder access$4200():4334 -> f
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4389 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.kQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.DQ:
     java.util.List enumEntry_ -> r
     java.util.List property_ -> p
     int fqName_ -> f
@@ -90385,11 +91068,11 @@
     1:1:java.util.List getSupertypeIdList():9110:9110 -> x
     1:1:java.util.List getSupertypeList():9074:9074 -> y
     1:1:java.util.List getTypeAliasList():9260:9260 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.hQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.AQ:
     1:1:void <init>():8838:8838 -> <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):8843:8843 -> 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):8838 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.iQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.BQ:
     java.util.List sealedSubclassFqName_ -> r
     java.util.List enumEntry_ -> q
     java.util.List typeAlias_ -> p
@@ -90597,7 +91280,7 @@
     2:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setFqName(int):10319:10320 -> f
     1:91:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class buildPartial():9897:9987 -> g
     92:93:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder setInlineClassUnderlyingPropertyName(int):11456:11457 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.jQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.CQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind[] $VALUES -> c
     int value -> b
     1:25:void <clinit>():8864:8888 -> <clinit>
@@ -90605,7 +91288,7 @@
     1:2:void <init>(java.lang.String,int,int,int):8954:8955 -> <init>
     1:1:int getNumber():8925:8925 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind[] values():8855:8855 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.nQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.GQ:
     java.util.List valueParameter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor defaultInstance -> j
     int memoizedSerializedSize -> i
@@ -90665,11 +91348,11 @@
     1:1:boolean hasFlags():13802:13802 -> o
     1:3:void initFields():13888:13890 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():14020:14020 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.lQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.EQ:
     1:1:void <init>():13774:13774 -> <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):13779:13779 -> 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):13774 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.mQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.FQ:
     int flags_ -> f
     java.util.List versionRequirement_ -> h
     int bitField0_ -> e
@@ -90711,7 +91394,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder.create():14043:14043 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder access$12800():14030 -> f
     1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():14074:14091 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.qQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.JQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -90760,11 +91443,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23860 -> 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):23858:23858 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23860 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.oQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.HQ:
     1:1:void <init>():23703:23703 -> <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):23708:23708 -> 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):23703 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.pQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.IQ:
     java.util.List effect_ -> d
     int bitField0_ -> c
     1:91:void <init>():23872:23962 -> <init>
@@ -90806,7 +91489,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.create():23879:23879 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22600():23865 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23906:23912 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.vQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.OQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List effectConstructorArgument_ -> e
@@ -90868,11 +91551,11 @@
     1:1:boolean hasKind():24530:24530 -> n
     1:4:void initFields():24540:24543 -> o
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():24672:24672 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.rQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.KQ:
     1:1:void <init>():24270:24270 -> <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):24275:24275 -> 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):24270 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.sQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.LQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> d
     java.util.List effectConstructorArgument_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression conclusionOfConditionalEffect_ -> f
@@ -90932,7 +91615,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder.create():24696:24696 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$23100():24682 -> f
     1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24729:24749 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.tQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.MQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_CONSTANT -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType CALLS -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_NOT_NULL -> e
@@ -90943,7 +91626,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24357:24357 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24356:24356 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24355:24355 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.uQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.NQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> c
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind EXACTLY_ONCE -> d
@@ -90954,7 +91637,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24422:24422 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24421:24421 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24420:24420 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.yQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.RQ:
     int memoizedSerializedSize -> g
     int bitField0_ -> d
     int name_ -> e
@@ -90998,11 +91681,11 @@
     1:1:boolean hasName():20864:20864 -> m
     1:1:void initFields():20874:20874 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20979:20979 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.wQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.PQ:
     1:1:void <init>():20843:20843 -> <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):20848:20848 -> 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):20843 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.xQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.QQ:
     int name_ -> f
     int bitField0_ -> e
     1:1:void <init>():20995:20995 -> <init>
@@ -91041,7 +91724,7 @@
     10:10: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 -> g
     10:10:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry build():21023 -> g
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry build():21023:21023 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.CQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.VQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression defaultInstance -> m
@@ -91128,11 +91811,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25872 -> 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):25870:25870 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25872 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.zQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.SQ:
     1:1:void <init>():25389:25389 -> <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):25394:25394 -> 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):25389 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.AQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.TQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type isInstanceType_ -> g
     int isInstanceTypeId_ -> h
     java.util.List orArgument_ -> j
@@ -91216,7 +91899,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder.create():25896:25896 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder access$24000():25882 -> f
     1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25935:25968 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.BQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.UQ:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue FALSE -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue NULL -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue TRUE -> c
@@ -91227,7 +91910,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25442:25442 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25441:25441 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25440:25440 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.FQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.YQ:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function defaultInstance -> s
@@ -91349,11 +92032,11 @@
     1:1:boolean hasContract():15086:15086 -> x
     1:1:boolean hasFlags():14847:14847 -> y
     1:1:boolean hasName():14892:14892 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.DQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.WQ:
     1:1:void <init>():14811:14811 -> <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):14816:14816 -> 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):14811 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.EQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.XQ:
     java.util.List versionRequirement_ -> p
     int receiverTypeId_ -> m
     int returnTypeId_ -> j
@@ -91493,7 +92176,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder.create():15357:15357 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder access$13600():15344 -> f
     1:55:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function buildPartial():15406:15460 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.GQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.ZQ:
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind[] $VALUES -> c
     1:13:void <clinit>():205:217 -> <clinit>
@@ -91501,7 +92184,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.HQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.aR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality[] $VALUES -> c
     int value -> b
     1:13:void <clinit>():23:35 -> <clinit>
@@ -91509,7 +92192,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.KQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.dR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package defaultInstance -> l
@@ -91588,11 +92271,11 @@
     1:1:boolean hasVersionRequirementTable():12123:12123 -> r
     1:5:void initFields():12133:12137 -> s
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():12294:12294 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.IQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.bR:
     1:1:void <init>():11982:11982 -> <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):11987:11987 -> 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):11982 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.JQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.cR:
     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
     java.util.List function_ -> f
@@ -91699,7 +92382,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder.create():12317:12317 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder access$11100():12304 -> f
     1:27:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package buildPartial():12352:12378 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.NQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.gR:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -91813,11 +92496,11 @@
     1:1:boolean hasFlags():16817:16817 -> x
     1:1:boolean hasGetterFlags():17000:17000 -> y
     1:1:boolean hasName():16863:16863 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.LQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.eR:
     1:1:void <init>():16780:16780 -> <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):16785:16785 -> 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):16780 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.MQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.fR:
     int getterFlags_ -> o
     java.util.List versionRequirement_ -> q
     int receiverTypeId_ -> m
@@ -91930,7 +92613,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.create():17320:17320 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder access$15300():17307 -> f
     1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17369:17422 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.UQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.nR:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -92061,11 +92744,11 @@
     1:1:int getTypeParameter():5809:5809 -> x
     1:1:int getTypeParameterName():5832:5832 -> y
     1:1:boolean hasAbbreviatedType():5904:5904 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.OQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.hR:
     1:1:void <init>():4974:4974 -> <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):4979:4979 -> 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):4974 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.SQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.lR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument defaultInstance -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> h
@@ -92117,11 +92800,11 @@
     1:1:boolean hasTypeId():5259:5259 -> m
     1:3:void initFields():5269:5271 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder():5387:5387 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.PQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.iR:
     1:1:void <init>():5126:5126 -> <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):5131:5131 -> 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):5126 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.QQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.jR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> e
     int typeId_ -> f
@@ -92165,7 +92848,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():5411:5411 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder access$5000():5397 -> f
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5442:5457 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.RQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.kR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection INV -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection STAR -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection IN -> c
@@ -92178,7 +92861,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5187:5187 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5186:5186 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5185:5185 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.TQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.mR:
     int typeAliasName_ -> n
     int typeParameter_ -> l
     int typeParameterName_ -> m
@@ -92293,7 +92976,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6257 -> g
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6257:6257 -> g
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6263:6323 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.XQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.qR:
     int memoizedSerializedSize -> o
     int expandedTypeId_ -> k
     int underlyingTypeId_ -> i
@@ -92394,11 +93077,11 @@
     1:1:boolean hasName():19532:19532 -> x
     1:1:boolean hasUnderlyingType():19582:19582 -> y
     1:1:boolean hasUnderlyingTypeId():19597:19597 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.VQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.oR:
     1:1:void <init>():19486:19486 -> <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):19491:19491 -> 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):19486 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.WQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.pR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type expandedType_ -> k
     int expandedTypeId_ -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type underlyingType_ -> i
@@ -92504,7 +93187,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder.create():19931:19931 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder access$18100():19918 -> f
     1:43:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias buildPartial():19974:20016 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.bR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.uR:
     int memoizedSerializedSize -> m
     int upperBoundIdMemoizedSerializedSize -> k
     int name_ -> f
@@ -92586,11 +93269,11 @@
     1:1:boolean hasVariance():7518:7518 -> u
     1:6:void initFields():7586:7591 -> v
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7759:7759 -> w
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.YQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.rR:
     1:1:void <init>():7387:7387 -> <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):7392:7392 -> 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):7387 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.ZQ:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.sR:
     int id_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance variance_ -> i
     java.util.List upperBound_ -> j
@@ -92635,7 +93318,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder.create():7782:7782 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder access$7600():7769 -> f
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7819:7848 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.aR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.tR:
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance INV -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance IN -> c
@@ -92646,7 +93329,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7440:7440 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7439:7439 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7438:7438 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.eR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.xR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List type_ -> d
     int memoizedSerializedSize -> g
@@ -92699,11 +93382,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():13296 -> 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):13294:13294 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():13296 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.cR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.vR:
     1:1:void <init>():13105:13105 -> <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):13110:13110 -> 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):13105 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.dR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.wR:
     java.util.List type_ -> d
     int firstNullable_ -> e
     int bitField0_ -> c
@@ -92735,7 +93418,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():13315:13315 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$12100():13301 -> f
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13344:13356 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.hR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.AR:
     int memoizedSerializedSize -> l
     byte memoizedIsInitialized -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> i
@@ -92812,11 +93495,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18760 -> 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):18758:18758 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18760 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.fR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.yR:
     1:1:void <init>():18474:18474 -> <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):18479:18479 -> 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):18474 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.gR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.zR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> j
     int varargElementTypeId_ -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> h
@@ -92882,7 +93565,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder.create():18778:18778 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder access$17000():18765 -> f
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18815:18842 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.mR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.FR:
     byte memoizedIsInitialized -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
@@ -92946,11 +93629,11 @@
     1:1:boolean hasVersionKind():21625:21625 -> s
     1:6:void initFields():21640:21645 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():21776:21776 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.iR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.BR:
     1:1:void <init>():21348:21348 -> <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):21353:21353 -> 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):21348 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.jR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.CR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> f
     int message_ -> h
     int errorCode_ -> g
@@ -92986,7 +93669,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():21800:21800 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$20100():21786 -> f
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21837:21864 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.kR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.DR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level HIDDEN -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level ERROR -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level WARNING -> c
@@ -92997,7 +93680,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21401:21401 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21400:21400 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21399:21399 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.lR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.ER:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind API_VERSION -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> d
@@ -93008,7 +93691,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21466:21466 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21465:21465 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21464:21464 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.pR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.IR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     java.util.List requirement_ -> c
@@ -93053,11 +93736,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22486 -> 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):22484:22484 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22486 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.nR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.GR:
     1:1:void <init>():22335:22335 -> <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):22340:22340 -> 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):22335 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.oR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.HR:
     java.util.List requirement_ -> d
     int bitField0_ -> c
     1:85:void <init>():22498:22582 -> <init>
@@ -93096,7 +93779,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder.create():22505:22505 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$21200():22491 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22532:22538 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.qR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.JR:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility[] $VALUES -> c
     int value -> b
     1:21:void <clinit>():105:125 -> <clinit>
@@ -93104,7 +93787,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.h5:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.BinaryVersion -> com.android.tools.r8.internal.j5:
 # {"id":"sourceFile","fileName":"BinaryVersion.kt"}
     java.util.List rest -> e
     int patch -> d
@@ -93130,7 +93813,7 @@
     1:1:java.lang.String toString():70 -> toString
     2:6:java.lang.String toString():99:103 -> toString
     7:7:java.lang.String toString():71:71 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.rl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.wl:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_CROSSINLINE -> q
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField DECLARES_DEFAULT_VALUE -> p
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_NOT_DEFAULT -> s
@@ -93235,14 +93918,14 @@
     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):199 -> 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):199:199 -> 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$BooleanFlagField -> com.android.tools.r8.internal.ol:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.tl:
     1:1:void <init>(int):269:269 -> <init>
     java.lang.Object get(int) -> a
     1:1:int toFlags(java.lang.Boolean):280:280 -> a
     1:1:java.lang.Boolean get(int):275:275 -> 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):275 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.pl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.ul:
     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[]):290:291 -> <init>
     1:6:int bitWidth(java.lang.Object[]):295:300 -> a
@@ -93254,22 +93937,22 @@
     307:307:int bitWidth(java.lang.Object[]):300:300 -> a
     311:315: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):306:310 -> a
     311:315:java.lang.Object get(int):286 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.ql:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.vl:
     int bitWidth -> b
     int offset -> a
     1:1:void <init>(int,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1):234:234 -> <init>
     2:4:void <init>(int,int):256:258 -> <init>
     java.lang.Object get(int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.jI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.qI:
 # {"id":"sourceFile","fileName":"NameResolver.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.rR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt -> com.android.tools.r8.internal.KR:
 # {"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.WR:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt -> com.android.tools.r8.internal.pS:
 # {"id":"sourceFile","fileName":"protoTypeTableUtil.kt"}
     1:3: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):62:64 -> a
     4:6: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):76:78 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.X20:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.t30:
 # {"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>
@@ -93277,7 +93960,7 @@
     22:35:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):27:40 -> <init>
     36:36: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.r40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.N40:
 # {"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
@@ -93308,7 +93991,9 @@
     254:254:java.lang.String toString():81:81 -> toString
     255:255:java.lang.String toString():81:81 -> toString
     246:246:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.q40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion:
+# {"id":"sourceFile","fileName":"VersionRequirement.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.M40:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     int minor -> b
     int patch -> c
@@ -93323,7 +94008,9 @@
     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.s40:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion -> com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion:
+# {"id":"sourceFile","fileName":"VersionRequirement.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.O40:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     java.util.List infos -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable EMPTY -> b
@@ -93340,7 +94027,9 @@
     5:5:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt.getOrNull(java.util.List,int):304:304 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12 -> a
     6:6: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.jvm.JvmProtoBuf -> com.android.tools.r8.internal.yy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion:
+# {"id":"sourceFile","fileName":"VersionRequirement.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.Ey:
     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
@@ -93356,7 +94045,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension anonymousObjectOriginName -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension packageLocalVariable -> n
     1:233:void <clinit>():3965:4197 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.ky:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.qy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature defaultInstance -> h
     int memoizedSerializedSize -> g
@@ -93405,11 +94094,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2834 -> 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):2832:2832 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2834 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.iy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.oy:
     1:1:void <init>():2671:2671 -> <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):2676:2676 -> 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):2671 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.jy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.py:
     int name_ -> d
     int desc_ -> e
     int bitField0_ -> c
@@ -93437,7 +94126,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():2853:2853 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder access$2500():2839 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2882:2893 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.ny:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.ty:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> h
     int memoizedSerializedSize -> g
@@ -93486,11 +94175,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2372 -> 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):2370:2370 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2372 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.ly:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.ry:
     1:1:void <init>():2209:2209 -> <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):2214:2214 -> 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):2209 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.my:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.sy:
     int name_ -> d
     int desc_ -> e
     int bitField0_ -> c
@@ -93518,7 +94207,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():2391:2391 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder access$1800():2377 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2420:2431 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.qy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.wy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> f
     byte memoizedIsInitialized -> i
@@ -93577,11 +94266,11 @@
     1:1:boolean hasSyntheticMethod():3265:3265 -> q
     1:5:void initFields():3334:3338 -> r
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3462:3462 -> s
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.oy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.uy:
     1:1:void <init>():3225:3225 -> <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):3230:3230 -> 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):3225 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.py:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.vy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> g
@@ -93675,7 +94364,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():3486:3486 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3472 -> f
     1:24:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3521:3544 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.xy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.Dy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes defaultInstance -> h
     java.util.List localName_ -> d
@@ -93725,11 +94414,11 @@
     1:1:java.util.List getRecordList():1569:1569 -> i
     1:2:void initFields():1634:1635 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder():1752:1752 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.ry:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.xy:
     1:1:void <init>():172:172 -> <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):177:177 -> 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):172 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.sy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.yy:
     java.util.List localName_ -> e
     java.util.List record_ -> d
     int bitField0_ -> c
@@ -93779,7 +94468,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.create():1776:1776 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder access$1200():1762 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1805:1816 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.wy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.Cy:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     int memoizedSerializedSize -> m
     java.lang.Object string_ -> f
@@ -93883,11 +94572,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():943 -> 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):941:941 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():943 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.ty:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.zy:
     1:1:void <init>():471:471 -> <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):476:476 -> 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):471 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.uy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.Ay:
     java.lang.Object string_ -> f
     java.util.List replaceChar_ -> i
     int range_ -> d
@@ -93931,7 +94620,7 @@
     1:1:int getSubstringIndexCount():1373:1373 -> j
     1:1:boolean hasOperation():1301:1301 -> k
     1:1:boolean hasPredefinedIndex():1153:1153 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.vy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.By:
     int value -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation DESC_TO_CLASS_ID -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation INTERNAL_TO_CLASS_ID -> d
@@ -93942,7 +94631,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):544:544 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):543:543 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation valueOf(int):542:542 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.p5:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding -> com.android.tools.r8.internal.r5:
     boolean FORCE_8TO7_ENCODING -> a
     boolean $assertionsDisabled -> b
     1:13:void <clinit>():15:27 -> <clinit>
@@ -94008,7 +94697,7 @@
     173:173:byte[] decodeBytes(java.lang.String[]):191 -> a
     174:190:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding.decode7to8(byte[]):247:263 -> a
     174:190:byte[] decodeBytes(java.lang.String[]):192 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.Ka:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.Na:
 # {"id":"sourceFile","fileName":"ClassMapperLite.kt"}
     java.util.Map map -> b
     java.lang.String kotlin -> a
@@ -94092,12 +94781,12 @@
     462:462:void <clinit>():22:22 -> <clinit>
     1:1:void map$lambda-0$add(java.util.Map,java.lang.String,java.lang.String):42:42 -> a
     2:2:java.lang.String mapClass(java.lang.String):80:80 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.Px:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.Vx:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():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.Mx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.Sx:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -94126,7 +94815,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.Nx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.Tx:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -94155,7 +94844,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.ay:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.hy:
 # {"id":"sourceFile","fileName":"JvmMetadataVersion.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> g
     boolean isStrictSemantics -> f
@@ -94163,7 +94852,7 @@
     1:1:void <init>(int[],boolean):14:14 -> <init>
     2:2:void <init>(int[]):15:15 -> <init>
     1:6:boolean isCompatible():19:24 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.dy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.jy:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     java.util.Set localNameIndices -> c
     java.util.List PREDEFINED_STRINGS -> e
@@ -94534,7 +95223,9 @@
     1:1:java.lang.String[] getStrings():15:15 -> b
     2:2:boolean isLocalClassName(int):77:77 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getTypes():14:14 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.zy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion:
+# {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.Fy:
 # {"id":"sourceFile","fileName":"JvmProtoBufUtil.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EXTENSION_REGISTRY -> a
     int $r8$clinit -> b
@@ -94649,7 +95340,9 @@
     7:7:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
     8:8: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
     8:8: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.Ay:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.UtfEncodingKt -> com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.UtfEncodingKt:
+# {"id":"sourceFile","fileName":"utfEncoding.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.Gy:
 # {"id":"sourceFile","fileName":"JvmStringTable.kt"}
     java.util.LinkedHashSet localNames -> d
     java.util.ArrayList records -> b
@@ -94695,7 +95388,7 @@
     740:740:void serializeTo(java.io.OutputStream):98 -> a
     741:741: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():1799:1799 -> a
     741:741:void serializeTo(java.io.OutputStream):98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.Mv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.Sv:
 # {"id":"sourceFile","fileName":"Interner.kt"}
     java.util.HashMap interned -> b
     int firstIndex -> a
@@ -94704,13 +95397,15 @@
     21:24: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$special$$inlined$sortedBy$1 -> com.android.tools.r8.internal.Lv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$special$$inlined$sortedBy$1 -> com.android.tools.r8.internal.Rv:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     java.util.HashMap $receiver$inlined -> b
     1:1:int compare(java.lang.Object,java.lang.Object):321:321 -> compare
     2:2:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):78:78 -> compare
     2:2: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.hI:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable -> com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable:
+# {"id":"sourceFile","fileName":"MutableTable.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.oI:
 # {"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>
@@ -94749,7 +95444,7 @@
     69:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():40:40 -> a
     69:69:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():0 -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.H00:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.d10:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     byte[] bytes -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> a
@@ -94851,7 +95546,7 @@
     9:9: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
     9:9: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
     9:9: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.t6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString -> com.android.tools.r8.internal.v6:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString EMPTY -> b
     boolean $assertionsDisabled -> c
     1:22:void <clinit>():60:81 -> <clinit>
@@ -94878,9 +95573,9 @@
     int peekCachedHashCode() -> e
     java.lang.String toString(java.lang.String) -> f
     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.r6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator -> com.android.tools.r8.internal.t6:
     byte nextByte() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.s6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output -> com.android.tools.r8.internal.u6:
     int bufferPos -> f
     byte[] EMPTY_BYTE_ARRAY -> g
     int flushedBuffersTotalBytes -> d
@@ -94909,7 +95604,7 @@
     20:28:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$Output.flushFullBuffer(int):898:906 -> write
     20:28:void write(byte[],int,int):814 -> write
     29:30:void write(byte[],int,int):815:816 -> write
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.dc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.gc:
     byte[] buffer -> a
     int currentLimit -> h
     int recursionDepth -> i
@@ -95041,7 +95736,7 @@
     7:7:int readTag():158 -> n
     8:8:int readTag():158:158 -> n
     1:8:void recomputeBufferSizeAfterLimit():1001:1008 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.fc:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.ic:
     byte[] buffer -> a
     java.io.OutputStream output -> d
     int limit -> b
@@ -95156,9 +95851,9 @@
     14:14:void writeSInt64(int,long):342 -> e
     1:4:void writeRawLittleEndian32(int):1246:1249 -> f
     1:4:void writeRawVarint32(int):1195:1198 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.ec:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.hc:
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.Xj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.ck:
     java.util.Map extensionsByNumber -> a
     int $r8$clinit -> b
     1:1:void <clinit>():159:159 -> <clinit>
@@ -95177,13 +95872,13 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     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.Wj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.bk:
     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.Nk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.Sk:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet DEFAULT_INSTANCE -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap fields -> a
     int $r8$clinit -> e
@@ -95539,8 +96234,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.Mk:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Cm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.Rk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Hm:
     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:738:java.lang.reflect.Method getMethodOrDie(java.lang.Class,java.lang.String,java.lang.Class[]):0:737 -> a
@@ -95648,14 +96343,14 @@
     884:884:boolean access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,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):49 -> a
     885:885: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
     886:887: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
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.wm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.Bm:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> b
     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.xm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.Cm:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> c
     boolean extensionsIsMutable -> d
     1:3:void <init>():332:334 -> <init>
@@ -95703,7 +96398,7 @@
     36:36: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):433:433 -> a
     37:37: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 -> a
     37:37: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 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.zm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.Em:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> b
     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>
@@ -95746,7 +96441,7 @@
     1:1:int extensionsSerializedSize():316:316 -> h
     1:1:void makeExtensionsImmutable():261:261 -> i
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter newExtensionWriter():308:308 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.ym:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.Dm:
     java.util.Map$Entry next -> b
     java.util.Iterator iter -> a
     boolean messageSetWireFormat -> c
@@ -95790,7 +96485,7 @@
     16:16: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
     16:16:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
     17:22: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.Am:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.Fm:
     boolean isPacked -> e
     int number -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType type -> c
@@ -95800,7 +96495,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.Bm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.Gm:
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
     java.lang.reflect.Method enumValueOf -> e
@@ -95828,28 +96523,28 @@
     3:3: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
     3:3:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> b
     4:5: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.tv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.zv:
     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.rv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.xv:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.sv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.yv:
     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.Vv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.bw:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite unfinishedMessage -> b
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException setUnfinishedMessage(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):57:57 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getUnfinishedMessage():66:66 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException truncatedMessage():70:70 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.JC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.PC:
     java.util.Iterator iterator -> b
     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.YD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.fE:
     int hash -> e
     byte[] bytes -> d
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -95887,7 +96582,7 @@
     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$LiteralByteIterator -> com.android.tools.r8.internal.XD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.eE:
     int position -> b
     int limit -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> d
@@ -95898,12 +96593,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.aG:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.hG:
     boolean isInitialized() -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.MN:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.dO:
     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.kW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.FW:
     int treeDepth -> h
     int hash -> i
     int leftLength -> g
@@ -95980,7 +96675,7 @@
     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$Balancer -> com.android.tools.r8.internal.hW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.CW:
     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>
@@ -96011,7 +96706,7 @@
     691:691:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):635:635 -> a
     692:692:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):635:635 -> a
     689:689:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):635:635 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.iW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.DW:
     java.util.Stack breadCrumbs -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next -> c
     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>
@@ -96030,7 +96725,7 @@
     8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> j
     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.jW:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.EW:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator bytes -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator pieces -> b
     int bytesRemaining -> d
@@ -96041,7 +96736,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$1 -> com.android.tools.r8.internal.IX:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.dY:
     java.util.Map com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.overflowEntries -> d
     java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.entryList -> c
     boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.isImmutable -> e
@@ -96094,31 +96789,31 @@
     1:4:java.util.Set com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.entrySet():353:356 -> entrySet
     1:4:java.util.Set com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.entrySet():0 -> entrySet
       # {"id":"com.android.tools.r8.synthesized"}
-    1:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.checkMutable():364:365 -> g
     1:6:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.get(java.lang.Object):227:232 -> get
     1:6:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.get(java.lang.Object):0 -> get
       # {"id":"com.android.tools.r8.synthesized"}
-    1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getNumArrayEntries():180:180 -> k
-    1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getNumArrayEntries():0 -> k
+    1:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.checkMutable():364:365 -> h
+    1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getNumArrayEntries():180:180 -> l
+    1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getNumArrayEntries():0 -> l
       # {"id":"com.android.tools.r8.synthesized"}
-    1:1:java.lang.Iterable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getOverflowEntries():195:195 -> l
-    1:1:java.lang.Iterable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getOverflowEntries():0 -> l
+    1:1:java.lang.Iterable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getOverflowEntries():195:195 -> m
+    1:1:java.lang.Iterable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getOverflowEntries():0 -> m
       # {"id":"com.android.tools.r8.synthesized"}
-    1:1:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.isImmutable():175:175 -> m
-    1:1:void makeImmutable():104 -> m
-    2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getNumArrayEntries():180:180 -> m
-    2:2:void makeImmutable():105 -> m
-    3:5:void makeImmutable():106:108 -> m
-    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> m
-    6:6:void makeImmutable():108 -> m
+    1:1:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.isImmutable():175:175 -> n
+    1:1:void makeImmutable():104 -> n
+    2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.getNumArrayEntries():180:180 -> n
+    2:2:void makeImmutable():105 -> n
+    3:5:void makeImmutable():106:108 -> n
+    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> n
+    6:6:void makeImmutable():108 -> n
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:13:void makeImmutable():109:115 -> m
-    14:14:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> m
-    14:14:void makeImmutable():115 -> m
+    7:13:void makeImmutable():109:115 -> n
+    14:14:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> n
+    14:14:void makeImmutable():115 -> n
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:16:void makeImmutable():116:117 -> m
-    17:25:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.makeImmutable():161:169 -> m
-    17:25:void makeImmutable():121 -> m
+    15:16:void makeImmutable():116:117 -> n
+    17:25:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.makeImmutable():161:169 -> n
+    17:25:void makeImmutable():121 -> n
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):100:100 -> put
     1:4:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.remove(java.lang.Object):279:282 -> remove
     1:4:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.remove(java.lang.Object):0 -> remove
@@ -96151,20 +96846,20 @@
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.size():202:202 -> size
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap.size():0 -> size
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.LX:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.gY:
     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.JX:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.eY:
     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.KX:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.fY:
     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.MX:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.hY:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     java.lang.Comparable key -> b
     java.lang.Object value -> c
@@ -96192,7 +96887,7 @@
     1:1:int hashCode():452:452 -> hashCode
     1:3:java.lang.Object setValue(java.lang.Object):431:433 -> setValue
     1:1:java.lang.String toString():458:458 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.NX:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.iY:
     java.util.Iterator lazyOverflowIterator -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> e
     int pos -> b
@@ -96215,7 +96910,7 @@
     9:12:void remove():566 -> remove
     13:13:void remove():566:566 -> remove
     14:14:void remove():558:558 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.OX:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.jY:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> b
     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>
@@ -96227,9 +96922,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.l30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.H30:
     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.T30:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.p40:
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
     67:67:int partialIsValidUtf8(byte[],int,int):252:252 -> a
     68:79:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8.partialIsValidUtf8NonAscii(byte[],int,int):270:281 -> a
@@ -96250,9 +96945,9 @@
     94:94:int partialIsValidUtf8(byte[],int,int):256 -> a
     95:95:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8.partialIsValidUtf8NonAscii(byte[],int,int):306:306 -> a
     95:95:int partialIsValidUtf8(byte[],int,int):256 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.v50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.R50:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.t50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.P50:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType MESSAGE -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType GROUP -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType ENUM -> h
@@ -96266,18 +96961,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.p50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.L50:
     1:117:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):0:116 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.q50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.M50:
     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.r50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.N50:
     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.s50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.O50:
     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.u50:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.Q50:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType DOUBLE -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BOOLEAN -> g
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType LONG -> d
@@ -96290,7 +96985,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType INT -> c
     1:9:void <clinit>():78:86 -> <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.Cx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.Ix:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():85:85 -> <clinit>
@@ -96304,7 +96999,7 @@
     1:1:void visitEnd():75 -> b
     2:2:void visitEnd():75:75 -> 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.Fx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.Lx:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     1:1:void <clinit>():280:280 -> <clinit>
@@ -96312,14 +97007,14 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):256:256 -> <init>
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():260:260 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.Gx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.Mx:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor delegate -> a
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor):14:15 -> <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.Ix:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.Ox:
 # {"id":"sourceFile","fileName":"jvmExtensions.kt"}
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):25:25 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor):167 -> a
@@ -96330,7 +97025,7 @@
     1:1: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):31:31 -> b
     1:1:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):182 -> b
     2:2:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):182:182 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.Jx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.Px:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -96347,7 +97042,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.Lx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.Rx:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor delegate -> a
@@ -96358,14 +97053,16 @@
     2:2:void visitLambdaClassOriginName(java.lang.String):144:144 -> a
     3:3:void visitEnd():151:151 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():126:126 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.Ox:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.Ux:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():16:16 -> <init>
     java.lang.String asString() -> a
     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.cy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt -> com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignatureKt:
+# {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.iy:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -96382,7 +97079,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.fy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.ly:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():115:115 -> <clinit>
@@ -96394,7 +97091,7 @@
     1:1:void visitEnd():105 -> b
     2:2:void visitEnd():105:105 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():99:99 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.hy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.ny:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor delegate -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
@@ -96407,7 +97104,7 @@
     1:1:void visitSyntheticMethodForDelegate(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):232:232 -> b
     2:2:void visitEnd():239:239 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():172:172 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.Cy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.Iy:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor delegate -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
@@ -96418,7 +97115,7 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):344:344 -> a
     2:2:void visitEnd():351:351 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():327:327 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Ey:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Ky:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor delegate -> a
@@ -96428,7 +97125,7 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):299:299 -> a
     2:2:void visitEnd():306:306 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():291:291 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.OA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.UA:
 # {"id":"sourceFile","fileName":"KotlinClassHeader.kt"}
     java.lang.String packageName -> g
     java.lang.String extraString -> f
@@ -96513,7 +97210,7 @@
     5:5:java.lang.Object invoke():30 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair invoke():32:32 -> a
     6:6:java.lang.Object invoke():30 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.RA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.XA:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():310:310 -> <init>
     1:1:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.checkMetadataVersion(int[]):345:345 -> a
@@ -96594,6 +97291,8 @@
     java.util.List partClassNames -> b
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):205:209 -> <init>
     1:1:java.util.List getPartClassNames():209:209 -> b
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer -> com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade$Writer:
+# {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
 com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):246:247 -> <init>
@@ -96707,10 +97406,10 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> b
     1:2:com.android.tools.r8.jetbrains.kotlin.Pair invoke():134:135 -> a
     1:2:java.lang.Object invoke():133 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.SA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.YA:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):308:308 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.Bx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.Hx:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     int jvmFlags -> f
@@ -96732,7 +97431,7 @@
     1:1:int getJvmFlags():38:38 -> d
     1:1:java.util.List getLocalDelegatedProperties():35:35 -> e
     1:1:java.lang.String getModuleName():36:36 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.Ex:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.Kx:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> b
     1:1:void <init>():145:145 -> <init>
@@ -96742,10 +97441,10 @@
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():146:146 -> a
     6:6:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):149:149 -> a
     1:1:void setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):146:146 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt -> com.android.tools.r8.internal.Hx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt -> com.android.tools.r8.internal.Nx:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     1:1: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.Kx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.Qx:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> c
     java.lang.String lambdaClassOriginName -> d
@@ -96757,7 +97456,7 @@
     8:8:void visitLambdaClassOriginName(java.lang.String):97:97 -> a
     1:1:java.lang.String getLambdaClassOriginName():90:90 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():89:89 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.Zx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.gy:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     1:1:void <init>():17:17 -> <init>
     void readTypeAliasExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext) -> a
@@ -96812,7 +97511,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension createTypeExtension():311:311 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension createTypeParameterExtension():309:309 -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmValueParameterExtension createValueParameterExtension() -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.Rx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.Xx:
 # {"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
@@ -96821,7 +97520,7 @@
     2:3:void visitModuleName(java.lang.String):134:135 -> a
     4:4:void visitJvmFlags(int):141:141 -> a
     1:1:void visitAnonymousObjectOriginName(java.lang.String):124:124 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Qx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Wx:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder $proto -> b
     1:1:java.lang.Object invoke(java.lang.Object):129:129 -> a
@@ -96840,14 +97539,14 @@
     138:138:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17363:17363 -> a
     138:138: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):130 -> a
     138:138:java.lang.Object invoke(java.lang.Object):129 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.Sx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.Yx:
 # {"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.internal.metadata.ProtoBuf$Constructor$Builder $proto -> b
     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$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):249:249 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):252:252 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.Tx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.Zx:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder $proto -> c
@@ -96855,14 +97554,14 @@
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):177:177 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):180:180 -> a
     2:2:void visitLambdaClassOriginName(java.lang.String):185:185 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.Vx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.cy:
 # {"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):151:151 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):154:154 -> a
     2:3:void visitModuleName(java.lang.String):159:160 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Ux:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.ay:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder $proto -> b
     1:1:java.lang.Object invoke(java.lang.Object):154:154 -> a
@@ -96881,7 +97580,7 @@
     163:163:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder.build():17363:17363 -> a
     163:163: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):155 -> a
     163:163:java.lang.Object invoke(java.lang.Object):154 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.Wx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.dy:
 # {"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 signatureOrNull -> d
@@ -96911,7 +97610,7 @@
     11:11: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():3515:3515 -> b
     11:11:void visitEnd():239 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder getSignature():199:199 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.Xx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.ey:
 # {"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
@@ -96926,7 +97625,7 @@
     6:6:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):279 -> a
     7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
     7:7:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):279 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.Yx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.fy:
 # {"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
@@ -96940,7 +97639,7 @@
     5:5:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):264 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder.build():4371:4371 -> a
     6:6:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):264 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.ey:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.ky:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String moduleName -> d
@@ -96956,7 +97655,7 @@
     123:123:void visitModuleName(java.lang.String):75:75 -> a
     1:1:java.util.List getLocalDelegatedProperties():68:68 -> c
     1:1:java.lang.String getModuleName():69:69 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.gy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.my:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForDelegate -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> g
@@ -96977,7 +97676,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature():112:112 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations():113:113 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForDelegate():114:114 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.By:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.Hy:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> d
     boolean isRaw -> c
@@ -96993,7 +97692,7 @@
     14:14:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):181:181 -> a
     1:1:java.util.List getAnnotations():174:174 -> b
     1:1:boolean isRaw():173:173 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.Dy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.Jy:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> c
     1:2:void <init>():158:159 -> <init>
@@ -97006,7 +97705,7 @@
     31:31:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):158 -> a
     32:32:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):162:162 -> a
     1:1:java.util.List getAnnotations():159:159 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.android.tools.r8.internal.Fy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt -> com.android.tools.r8.internal.Ly:
 # {"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:66: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:62 -> a
@@ -97015,31 +97714,31 @@
     67:67: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
     68:75: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:24 -> a
     76:85: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:24 -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.kA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.qA:
     void get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.lA:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.mA:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.nA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.rA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.sA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.tA:
     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.oA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.uA:
     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.pA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.vA:
     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.qA:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.rA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.wA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.xA:
     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.sA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.yA:
     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.tA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.zA:
     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.uA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.AA:
     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.vA:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.wA:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.xA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.BA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.CA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.DA:
     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.yA:
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.GA:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.EA:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.MA:
     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
@@ -97047,11 +97746,11 @@
     com.android.tools.r8.kotlin.Kotlin$Intrinsics intrinsics -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:7:void <init>(com.android.tools.r8.graph.DexItemFactory):93:99 -> <init>
-com.android.tools.r8.kotlin.Kotlin$ClassClassifiers -> com.android.tools.r8.internal.BA:
+com.android.tools.r8.kotlin.Kotlin$ClassClassifiers -> com.android.tools.r8.internal.HA:
     java.util.Set kotlinStaticallyKnownTypes -> a
     1:32:void <clinit>():58:89 -> <clinit>
     1:2:void lambda$static$0(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,java.lang.String):81:82 -> a
-com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.CA:
+com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.IA:
     com.android.tools.r8.graph.DexType lambdaType -> a
     com.android.tools.r8.kotlin.Kotlin this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.kotlin.Kotlin$1):102:102 -> <init>
@@ -97061,7 +97760,7 @@
     13:26:void <init>(com.android.tools.r8.kotlin.Kotlin):117:130 -> <init>
     27:27:void <init>(com.android.tools.r8.kotlin.Kotlin):128:128 -> <init>
     1:1:com.android.tools.r8.graph.DexType lambda$new$0(java.lang.Integer):120:120 -> a
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.DA:
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.JA:
     com.android.tools.r8.graph.DexMethod checkNotNullParameter -> d
     com.android.tools.r8.graph.DexMethod checkParameterIsNotNull -> c
     com.android.tools.r8.graph.DexMethod throwParameterIsNullNPE -> b
@@ -97073,7 +97772,7 @@
     25:31:void <init>(com.android.tools.r8.kotlin.Kotlin):177:183 -> <init>
     32:37:void <init>(com.android.tools.r8.kotlin.Kotlin):181:186 -> <init>
     38:38:void <init>(com.android.tools.r8.kotlin.Kotlin):185:185 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.EA:
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.KA:
     com.android.tools.r8.graph.DexString kind -> a
     com.android.tools.r8.graph.DexString metadataVersion -> b
     com.android.tools.r8.graph.DexString bytecodeVersion -> c
@@ -97083,11 +97782,11 @@
     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):144:152 -> <init>
-com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.FA:
+com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.LA:
     com.android.tools.r8.graph.DexField enabledField -> b
     com.android.tools.r8.graph.DexType type -> a
     1:5:void <init>(com.android.tools.r8.kotlin.Kotlin):155:159 -> <init>
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.MA:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.SA:
     java.util.Map EMPTY_ARGUMENTS -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():25:25 -> <init>
@@ -97098,7 +97797,7 @@
     11:20:void lambda$create$0(java.util.LinkedHashMap,com.android.tools.r8.graph.DexItemFactory,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):53 -> a
     21:21:void lambda$create$0(java.util.LinkedHashMap,com.android.tools.r8.graph.DexItemFactory,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):53:53 -> a
     22:26:java.util.Map create(java.util.Map,com.android.tools.r8.graph.DexItemFactory):49:53 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.HA:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.NA:
     com.android.tools.r8.kotlin.KotlinAnnotationInfo value -> b
     1:2:void <init>(com.android.tools.r8.kotlin.KotlinAnnotationInfo):123:124 -> <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):129:130 -> a
@@ -97106,7 +97805,7 @@
     3:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):135:135 -> a
     4:4:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):140:140 -> a
     5:5:void lambda$rewrite$0(java.util.function.Consumer,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):143:143 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.IA:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.OA:
     java.util.List value -> b
     com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo EMPTY -> c
     1:2:void <clinit>():152:153 -> <clinit>
@@ -97116,7 +97815,7 @@
     9:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):174:175 -> a
     11:23:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):181:193 -> a
     24:24:void lambda$rewrite$0(java.util.List,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):188:188 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.JA:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.PA:
     int arrayDimensionCount -> c
     com.android.tools.r8.kotlin.KotlinTypeReference value -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,int):62:64 -> <init>
@@ -97125,7 +97824,7 @@
     4:4:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):75:75 -> a
     5:5:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):80:80 -> a
     6:6:void lambda$rewrite$0(java.util.function.Consumer,java.lang.String):81:81 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.KA:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.QA:
     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):92:94 -> <init>
@@ -97136,14 +97835,14 @@
     7:7:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):106:106 -> a
     8:8:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):111:111 -> a
     9:9:void lambda$rewrite$0(java.util.function.Consumer,java.lang.String):113:113 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.LA:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.RA:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument argument -> b
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):202:203 -> <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):207:207 -> a
     1:1:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo access$400(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):198 -> a
     2:2:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.AppView):217:217 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.NA:
+com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.TA:
     java.util.Map arguments -> b
     java.util.List EMPTY_ANNOTATIONS -> c
     com.android.tools.r8.kotlin.KotlinTypeReference annotationType -> a
@@ -97159,7 +97858,7 @@
     62:62:void lambda$rewrite$0(java.util.Map,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):71:71 -> a
     63:64:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):84:85 -> a
     65:65:void lambda$trace$3(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):85:85 -> a
-com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.PA:
+com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.VA:
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> l
     com.android.tools.r8.kotlin.KotlinMetadataMembersTracker originalMembersWithKotlinInfo -> t
     com.android.tools.r8.kotlin.KotlinTypeInfo inlineClassUnderlyingType -> r
@@ -97182,7 +97881,7 @@
     java.util.List enumEntries -> k
     1:22:void <init>(int,java.lang.String,boolean,java.lang.String,com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinVersionRequirementInfo,com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String,com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo,int[],java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker,int):81:102 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):112:112 -> a
-    2:2:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    2:2:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     2:2:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):113 -> a
     3:6:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):114:117 -> a
     7:11:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):116:120 -> a
@@ -97194,7 +97893,7 @@
     49:49: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
     49:49: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):243 -> a
     49:49:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):157 -> a
-    50:50:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    50:50:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     50:50:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):44 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     50:50: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):243 -> a
@@ -97300,21 +97999,21 @@
     1:1:java.util.function.Consumer lambda$trace$6(com.android.tools.r8.kotlin.KotlinTypeReference):414:414 -> b
     1:1:java.lang.String getPackageName():399:399 -> l
     1:1:int[] getMetadataVersion():404:404 -> m
-com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.QA:
+com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.WA:
     boolean isNoKotlinInformation() -> a
     com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView) -> a
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> f
     boolean isSyntheticClass() -> j
     java.lang.String getPackageName() -> l
     int[] getMetadataVersion() -> m
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.UA:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.aB:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():34:34 -> <clinit>
     1:3:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):51:53 -> a
-    4:4:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    4:4:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     4:4:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    5:5:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     5:5:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66 -> a
     6:6:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):66:66 -> a
     7:7:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):0:0 -> a
@@ -97330,10 +98029,10 @@
     294:294:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):70:70 -> a
     146:146:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):72:72 -> a
     147:153:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):67:73 -> a
-    154:154:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    154:154:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     154:154:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    155:155:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    155:155:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     155:155:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56 -> a
     156:156:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:56 -> a
     157:157:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):0:0 -> a
@@ -97417,14 +98116,14 @@
     2:2:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):214 -> c
     3:7:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):217:221 -> c
     8:8:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):215:215 -> c
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.TA:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.ZA:
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassMetadataReader$1):233:233 -> <init>
     2:2:void <init>(java.lang.String):235:235 -> <init>
-com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.aB:
+com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.gB:
     1:1:void <init>():23:23 -> <init>
     boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView) -> a
     com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens) -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.VA:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.bB:
     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):58:58 -> <init>
@@ -97444,38 +98143,38 @@
     7:7:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,java.lang.String):72:72 -> a
     11:11:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):80:80 -> a
     12:12:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):85:85 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.WA:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.cB:
     java.lang.String typeAlias -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):109:109 -> <init>
     2:3:void <init>(java.lang.String):113:114 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView):119:119 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.XA:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.dB:
     int typeId -> a
     1:1:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):89:89 -> <init>
     2:3:void <init>(int):93:94 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView):99:99 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.YA:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.eB:
     java.lang.String classifier -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):129:129 -> <init>
     2:3:void <init>(java.lang.String):132:133 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView):138:138 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.ZA:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.fB:
     java.lang.String classifier -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):148:148 -> <init>
     2:3:void <init>(java.lang.String):151:152 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView):157:157 -> a
-com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.bB:
+com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.hB:
     java.lang.String companionObjectFieldName -> a
     1:2:void <init>(java.lang.String):18:19 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:4:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,com.android.tools.r8.graph.DexField,com.android.tools.r8.naming.NamingLens):33:36 -> a
     boolean isCompanion() -> d
     com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> e
-com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.cB:
+com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.iB:
     java.util.List valueParameters -> b
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> c
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> d
@@ -97495,7 +98194,7 @@
     29:31:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):90:92 -> a
     com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> g
     boolean isConstructor() -> k
-com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.dB:
+com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.jB:
     java.util.List effects -> a
     com.android.tools.r8.kotlin.KotlinContractInfo NO_EFFECT -> b
     1:1:void <clinit>():22:22 -> <clinit>
@@ -97507,7 +98206,7 @@
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectInfo):48:48 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):48:48 -> a
     19:27:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider,com.android.tools.r8.graph.AppView):53:61 -> a
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.fB:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.lB:
     java.util.List functionsWithNoBacking -> b
     java.util.List typeAliases -> a
     java.util.List propertiesWithNoBacking -> c
@@ -97556,7 +98255,7 @@
     165:165:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinFunctionInfo):247:247 -> a
     1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):216:216 -> b
     1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinPropertyInfo):248:248 -> c
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.eB:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.kB:
     com.android.tools.r8.graph.DexEncodedField backingField -> a
     com.android.tools.r8.graph.DexEncodedMethod getter -> c
     com.android.tools.r8.graph.DexEncodedMethod setter -> b
@@ -97569,7 +98268,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$100(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):251:251 -> b
     2:3:void setSetter(com.android.tools.r8.graph.DexEncodedMethod):268:269 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$200(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):251:251 -> c
-com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.gB:
+com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.mB:
     java.util.List orArguments -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo isInstanceType -> d
     java.util.List andArguments -> e
@@ -97586,7 +98285,7 @@
     26:26:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):83:83 -> a
     27:45:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider,com.android.tools.r8.graph.AppView):88:106 -> a
     1:1:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):84:84 -> b
-com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.hB:
+com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.nB:
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo conclusion -> d
     java.util.List constructorArguments -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind invocationKind -> b
@@ -97595,8 +98294,8 @@
     1:1:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):49:49 -> a
     2:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):49:50 -> a
     4:10:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider,com.android.tools.r8.graph.AppView):54:60 -> a
-com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.iB:
-com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.jB:
+com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.oB:
+com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.pB:
     int[] metadataVersion -> c
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> a
     java.lang.String packageName -> b
@@ -97607,7 +98306,7 @@
     14:14:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):80:80 -> a
     1:1:java.lang.String getPackageName():70:70 -> l
     1:1:int[] getMetadataVersion():75:75 -> m
-com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.kB:
+com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.qB:
     com.android.tools.r8.kotlin.KotlinTypeInfo kotlinTypeInfo -> b
     java.lang.String typeFlexibilityId -> a
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo NO_FLEXIBLE_UPPER_BOUND -> c
@@ -97618,7 +98317,7 @@
     6:14:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,com.android.tools.r8.graph.AppView):42:50 -> a
     15:15:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,int):50:50 -> a
     16:23:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):55:62 -> a
-com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.lB:
+com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.rB:
     com.android.tools.r8.kotlin.KotlinTypeReference lambdaClassOrigin -> h
     com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> e
     java.util.List typeParameters -> f
@@ -97659,7 +98358,7 @@
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> b
     boolean isFunction() -> h
     1:1:boolean hasCrossInlineParameter():71:71 -> n
-com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.mB:
+com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.sB:
     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):25:27 -> <init>
@@ -97669,7 +98368,7 @@
     5:5:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
     6:18:boolean rewrite(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):42:54 -> a
     19:19:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):60:60 -> a
-com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.nB:
+com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.tB:
     java.util.List EMPTY_PARAMETERS_LIST -> e
     java.util.List parameters -> c
     boolean $assertionsDisabled -> f
@@ -97705,7 +98404,7 @@
     121:121:java.lang.String toString():105:105 -> toString
     122:122:java.lang.String toString():105:105 -> toString
     110:119:java.lang.String toString():107:116 -> toString
-com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation -> com.android.tools.r8.internal.pB:
+com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation -> com.android.tools.r8.internal.vB:
     java.util.Set noExtensionIndicesForFunctions -> a
     java.util.Set noExtensionIndicesForConstructors -> b
     com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation EMPTY -> c
@@ -97776,7 +98475,7 @@
     65:65:com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation readInformationFromMessage(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.utils.InternalOptions):91 -> a
     66:66:boolean hasJvmMethodSignatureExtensionForConstructor(int):121:121 -> a
     1:1:boolean hasJvmMethodSignatureExtensionForFunction(int):117:117 -> b
-com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$KotlinJvmSignatureExtensionInformationBuilder -> com.android.tools.r8.internal.oB:
+com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation$KotlinJvmSignatureExtensionInformationBuilder -> com.android.tools.r8.internal.uB:
     java.util.Set noExtensionIndicesForFunctions -> a
     java.util.Set noExtensionIndicesForConstructors -> b
     1:4:void <init>():132:135 -> <init>
@@ -97791,7 +98490,7 @@
     7:7:void visitConstructors(java.util.List):166:166 -> a
     8:9:void lambda$visitConstructors$0(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor,int):169:170 -> a
     1:1:void visitFunctions(java.util.List):154:154 -> b
-com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.qB:
+com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.wB:
     boolean hasBacking -> b
     com.android.tools.r8.kotlin.KotlinFunctionInfo function -> a
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinFunctionInfo,boolean):26:28 -> <init>
@@ -97807,7 +98506,7 @@
     16:23:com.android.tools.r8.kotlin.KotlinLambdaInfo create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):49:56 -> a
     24:35:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):63:74 -> a
     36:36:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):79:79 -> a
-com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.rB:
+com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.xB:
     java.util.List propertyInfos -> a
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo EMPTY_DELEGATED_PROPERTIES -> b
     boolean $assertionsDisabled -> c
@@ -97818,7 +98517,7 @@
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):51:51 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):51:51 -> a
     19:20:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.AppView):56:57 -> a
-com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.internal.sB:
+com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.internal.yB:
     boolean isNoKotlinInformation() -> a
     com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> b
     boolean isProperty() -> c
@@ -97828,7 +98527,7 @@
     boolean isFunction() -> h
     com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> i
     boolean isConstructor() -> k
-com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.tB:
+com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.zB:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     java.lang.String message -> d
@@ -97836,7 +98535,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.vB:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.BB:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set prunedTypes -> c
@@ -97854,10 +98553,10 @@
     47:47:void done(com.android.tools.r8.shaking.Enqueuer):96 -> a
     48:80:void done(com.android.tools.r8.shaking.Enqueuer):100:132 -> a
     81:84:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):68:71 -> a
-    85:85:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):61:61 -> a
+    85:85:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):72:72 -> a
     85:85:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):71 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    86:87:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):62:63 -> a
+    86:87:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):73:74 -> a
     86:87:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):71 -> a
     88:100:void lambda$done$2(com.android.tools.r8.shaking.Enqueuer,boolean,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):71:83 -> a
     101:102:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):41:42 -> a
@@ -97867,10 +98566,10 @@
     111:111:void lambda$done$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):84:84 -> a
     112:112:void lambda$done$3(java.util.Set,com.android.tools.r8.graph.ProgramMethod):106:106 -> a
     113:114:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):115:116 -> a
-    115:115:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):61:61 -> a
+    115:115:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):72:72 -> a
     115:115:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):116 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    116:117:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):62:63 -> a
+    116:117:boolean com.android.tools.r8.shaking.KeepClassInfo.isKotlinMetadataRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,boolean):73:74 -> a
     116:117:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):116 -> a
     118:128:void lambda$done$5(com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.graph.DexProgramClass):116:126 -> a
     129:129:com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension.definitionsForContext(com.android.tools.r8.graph.ProgramDefinition):50:50 -> a
@@ -97889,7 +98588,7 @@
     140:140:void lambda$done$6(com.android.tools.r8.graph.ProgramMember):137 -> a
     141:141:void lambda$done$6(com.android.tools.r8.graph.ProgramMember):137:137 -> a
     1:2:boolean lambda$done$4(com.android.tools.r8.graph.DexAnnotation):121:122 -> b
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.uB:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.AB:
     java.util.Set prunedTypes -> c
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> b
     com.android.tools.r8.graph.ProgramDefinition context -> a
@@ -97899,7 +98598,7 @@
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():174:174 -> a
     1:1:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):158:158 -> d
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):166:169 -> e
-com.android.tools.r8.kotlin.KotlinMetadataMembersTracker -> com.android.tools.r8.internal.wB:
+com.android.tools.r8.kotlin.KotlinMetadataMembersTracker -> com.android.tools.r8.internal.CB:
     java.util.Set references -> b
     boolean $assertionsDisabled -> c
     int count -> a
@@ -97911,10 +98610,10 @@
     24:24:void lambda$isEqual$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.Sets$SetView,com.android.tools.r8.graph.DexMember):53:53 -> a
     25:25:boolean com.android.tools.r8.kotlin.KotlinMetadataMembersTracker.isKotlinJvmType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):63:63 -> a
     25:25:boolean lambda$isEqual$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):54 -> a
-    26:26:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    26:26:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     26:26:boolean com.android.tools.r8.kotlin.KotlinMetadataMembersTracker.isKotlinJvmType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):63 -> a
     26:26:boolean lambda$isEqual$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):54 -> a
-com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.yB:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.EB:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     int[] METADATA_VERSION_1_4 -> d
@@ -97956,7 +98655,7 @@
     103:103: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):192 -> a
     90:90:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):71:71 -> a
     90:90: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):192 -> a
-    91:93:java.lang.String com.android.tools.r8.utils.StringUtils.stacktraceAsString(java.lang.Throwable):351:353 -> a
+    91:93:java.lang.String com.android.tools.r8.utils.StringUtils.stacktraceAsString(java.lang.Throwable):363:365 -> a
     91:93:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):74 -> a
     91:93: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):192 -> a
     94:94: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
@@ -97988,7 +98687,7 @@
     135:135:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$5(com.android.tools.r8.graph.DexClass,java.lang.Throwable):187 -> a
     122:122:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):71:71 -> a
     122:122:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$5(com.android.tools.r8.graph.DexClass,java.lang.Throwable):187 -> a
-    123:125:java.lang.String com.android.tools.r8.utils.StringUtils.stacktraceAsString(java.lang.Throwable):351:353 -> a
+    123:125:java.lang.String com.android.tools.r8.utils.StringUtils.stacktraceAsString(java.lang.Throwable):363:365 -> a
     123:125:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unexpectedErrorWhenRewriting(com.android.tools.r8.graph.DexType,java.lang.Throwable):74 -> a
     123:125:java.lang.Boolean lambda$writeKotlinInfoToAnnotation$5(com.android.tools.r8.graph.DexClass,java.lang.Throwable):187 -> a
     126:126: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
@@ -98023,7 +98722,7 @@
     2:2:void runForR8(java.util.concurrent.ExecutorService):87 -> b
     3:15:void runForR8(java.util.concurrent.ExecutorService):88:100 -> b
     16:16:void runForR8(java.util.concurrent.ExecutorService):99:99 -> b
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.xB:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.DB:
     boolean writeData2 -> e
     boolean writeExtraString -> f
     boolean writePackageName -> g
@@ -98036,7 +98735,7 @@
     2:10:void <init>(boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean):56:64 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo.rewriteAll():68:68 -> a
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo access$100():38 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.DB:
+com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.JB:
     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>():35:36 -> <clinit>
@@ -98056,7 +98755,7 @@
     116:116:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):197 -> a
     117:127:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):200:210 -> a
     1:1:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo getNoKotlinInfo():79:79 -> b
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.BB:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.HB:
     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
@@ -98071,17 +98770,17 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature():148:148 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$300(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):110:110 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature():152:152 -> c
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.AB:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.GB:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):118:118 -> <init>
     1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):121:124 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.zB:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.FB:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 this$1 -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():124:124 -> <clinit>
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1):124:124 -> <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):131:136 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.CB:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.IB:
     java.lang.String name -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinMetadataUtils$1):38:38 -> <init>
     2:3:void <init>(java.lang.String):43:44 -> <init>
@@ -98091,7 +98790,7 @@
     1:1:java.lang.String getPackageName():59:59 -> l
     1:1:int[] getMetadataVersion():64:64 -> m
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.EB:
+com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.KB:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
     1:122:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):0:121 -> a
@@ -98393,8 +99092,8 @@
     140:147:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):946:953 -> f
     148:161:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):947:960 -> f
     162:190:void lambda$appendKmEffectExpression$90(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):954:982 -> f
-com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.FB:
-com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.GB:
+com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.LB:
+com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.MB:
     java.util.List partClassNames -> a
     int[] metadataVersion -> c
     java.lang.String packageName -> b
@@ -98431,7 +99130,7 @@
     376:376:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):89:89 -> a
     1:1:java.lang.String getPackageName():79:79 -> l
     1:1:int[] getMetadataVersion():84:84 -> m
-com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.HB:
+com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.NB:
     int[] metadataVersion -> d
     java.lang.String facadeClassName -> a
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
@@ -98446,7 +99145,7 @@
     16:16:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):88:88 -> a
     1:1:java.lang.String getPackageName():78:78 -> l
     1:1:int[] getMetadataVersion():83:83 -> m
-com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.IB:
+com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.OB:
     com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo containerInfo -> b
     com.android.tools.r8.kotlin.KotlinMetadataMembersTracker originalMembersWithKotlinInfo -> d
     java.lang.String moduleName -> a
@@ -98464,7 +99163,7 @@
     16:16:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):69:69 -> a
     16:16: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.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):59 -> a
     17:17: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.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):64:64 -> a
-    18:18:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    18:18:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     18:18: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.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):65 -> a
     19:19: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.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):60:60 -> a
     20:20:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):16:16 -> a
@@ -98473,13 +99172,13 @@
     21:21:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):63:63 -> a
     21:21: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.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):70 -> a
     22:22: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.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):71:71 -> a
-    23:23:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    23:23:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     23:23: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.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):72 -> a
     24:24: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.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):69:69 -> a
     25:30:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):77:82 -> a
     31:44:boolean rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):79:92 -> a
     45:46:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):97:98 -> a
-com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.JB:
+com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.PB:
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForAnnotations -> n
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForDelegate -> o
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> i
@@ -98525,7 +99224,7 @@
     1:1:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo getFieldSignature():130:130 -> n
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getGetterSignature():134:134 -> o
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getSetterSignature():138:138 -> p
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.MB:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.SB:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():23:23 -> <clinit>
     1:17:java.lang.String parseStratumContents(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):193:209 -> a
@@ -98625,7 +99324,7 @@
     129:160:void lambda$parseStratumContents$2(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder,java.util.List):212 -> b
     161:168:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder):288:295 -> b
     161:168:void lambda$parseStratumContents$2(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder,java.util.List):212 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.KB:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.QB:
     java.io.BufferedReader reader -> b
     java.lang.String readLine -> c
     boolean $assertionsDisabled -> d
@@ -98656,23 +99355,23 @@
     65:65:void readExpectedLineOrThrow(java.lang.String):61:61 -> d
     1:1:java.lang.String readNextLine():51:51 -> e
     1:73:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):0:72 -> f
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.LB:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.RB:
     1:1:void <init>(java.lang.String):36:36 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.MB$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.SB$a:
     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):355:357 -> <init>
     1:1:com.android.tools.r8.naming.Range getRange():365:365 -> a
     1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():361:361 -> b
     1:10:java.lang.String toString():370:379 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.MB$b:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.SB$b:
     com.android.tools.r8.utils.SegmentTree inlineePositions -> a
     com.android.tools.r8.utils.SegmentTree calleePositions -> b
     1:3:void <init>(com.android.tools.r8.utils.SegmentTree,com.android.tools.r8.utils.SegmentTree):304:306 -> <init>
     1:1:java.util.Map$Entry lookupCalleePosition(int):314:314 -> a
     2:2:int inlinePositionsCount():318:318 -> a
     1:1:java.util.Map$Entry lookupInlinedPosition(int):310:310 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.MB$c:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.SB$c:
     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):328:328 -> <init>
@@ -98685,11 +99384,11 @@
     349:349:java.lang.String toString():347:347 -> toString
     350:350:java.lang.String toString():347:347 -> toString
     351:351:java.lang.String toString():347:347 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder -> com.android.tools.r8.internal.NB:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$StratumBuilder -> com.android.tools.r8.internal.TB:
     java.util.Map files -> b
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
     1:4:void <init>():322:325 -> <init>
-com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.OB:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.UB:
     com.android.tools.r8.kotlin.KotlinLambdaInfo lambda -> a
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour flavour -> d
     int[] metadataVersion -> c
@@ -98700,7 +99399,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda) -> a
     1:5:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):46:50 -> a
     6:11:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):49:54 -> a
-    12:12:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    12:12:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     12:12:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):54 -> a
     13:13:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.AppView):53:53 -> a
     14:21:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.getFlavour(com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin):107:114 -> a
@@ -98732,7 +99431,7 @@
     1:1:java.lang.String getPackageName():96:96 -> l
     1:1:int[] getMetadataVersion():101:101 -> m
     1:1:boolean isLambda():62:62 -> n
-com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.PB:
+com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.VB:
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo expandedType -> d
     java.util.List typeParameters -> e
@@ -98748,7 +99447,7 @@
     19:22:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):77:80 -> a
     23:23:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):79:79 -> a
     24:24:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):80:80 -> a
-com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.QB:
+com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.WB:
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo flexibleTypeUpperBound -> g
     java.util.List annotations -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo outerType -> d
@@ -98809,7 +99508,7 @@
     94:94:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeProjectionInfo):127:127 -> a
     95:95:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):129:129 -> a
     96:96:com.android.tools.r8.graph.DexType rewriteType(com.android.tools.r8.graph.GraphLens):133:133 -> a
-com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.RB:
+com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.XB:
     java.util.List annotations -> f
     java.util.List originalUpperBounds -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> d
@@ -98840,7 +99539,7 @@
     40:40:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeInfo):109:109 -> a
     41:42:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):109:110 -> a
     43:43:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):110:110 -> a
-com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.SB:
+com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.YB:
     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):21:23 -> <init>
@@ -98850,7 +99549,7 @@
     5:8:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider,com.android.tools.r8.graph.AppView):42:45 -> a
     9:9:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,int):45:45 -> a
     10:11:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):51:52 -> a
-com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.TB:
+com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.ZB:
     com.android.tools.r8.graph.DexType known -> a
     java.lang.String originalName -> b
     boolean $assertionsDisabled -> c
@@ -98890,7 +99589,7 @@
     7:7:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):231:231 -> o
     7:7:java.lang.String toKotlinClassifier(boolean):101 -> o
     1:1:java.lang.String toString():148:148 -> toString
-com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.UB:
+com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.aC:
     com.android.tools.r8.kotlin.KotlinTypeInfo varargElementType -> d
     java.util.List EMPTY_VALUE_PARAMETERS -> e
     com.android.tools.r8.kotlin.KotlinTypeInfo type -> c
@@ -98902,14 +99601,14 @@
     7:14:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):58:65 -> a
     15:19:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider,com.android.tools.r8.graph.AppView):70:74 -> a
     20:22:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):81:83 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.WB:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.cC:
     java.util.List versionRequirements -> a
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo NO_VERSION_REQUIREMENTS -> b
     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:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider):38:42 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.VB:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.bC:
     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
@@ -98923,7 +99622,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:9:void com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint.rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):78:80 -> a
     7:9:void access$100(com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):47 -> a
-com.android.tools.r8.lightir.ByteArrayIterator -> com.android.tools.r8.internal.l6:
+com.android.tools.r8.lightir.ByteArrayIterator -> com.android.tools.r8.internal.n6:
     int index -> d
     int size -> b
     byte[] buffer -> c
@@ -98934,24 +99633,24 @@
     1:1:boolean hasNext():22:22 -> hasNext
     1:1:java.lang.Byte com.android.tools.r8.lightir.ByteArrayIterator.next():32:32 -> next
     1:1:java.lang.Object next():9 -> next
-com.android.tools.r8.lightir.ByteArrayWriter -> com.android.tools.r8.internal.m6:
+com.android.tools.r8.lightir.ByteArrayWriter -> com.android.tools.r8.internal.o6:
     java.io.ByteArrayOutputStream buffer -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:4:void <init>():9:12 -> <init>
     1:2:void put(int):16:17 -> a
     3:3:byte[] toByteArray():21:21 -> a
-com.android.tools.r8.lightir.ByteUtils -> com.android.tools.r8.internal.v6:
+com.android.tools.r8.lightir.ByteUtils -> com.android.tools.r8.internal.x6:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():7:7 -> <clinit>
     boolean isU2(int) -> a
     int setBitAtIndex(int,int) -> a
-com.android.tools.r8.lightir.ByteWriter -> com.android.tools.r8.internal.x6:
+com.android.tools.r8.lightir.ByteWriter -> com.android.tools.r8.internal.z6:
     void put(int) -> a
-com.android.tools.r8.lightir.LIRBasicInstructionCallback -> com.android.tools.r8.internal.YB:
+com.android.tools.r8.lightir.LIRBasicInstructionCallback -> com.android.tools.r8.internal.eC:
     void onInstruction(int,int,int) -> a
-com.android.tools.r8.lightir.LIRBuilder -> com.android.tools.r8.internal.ZB:
+com.android.tools.r8.lightir.LIRBuilder -> com.android.tools.r8.internal.fC:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap constants -> c
     com.android.tools.r8.lightir.LIRWriter writer -> b
     com.android.tools.r8.lightir.ByteArrayWriter byteWriter -> a
@@ -98963,15 +99662,15 @@
     6:9:com.android.tools.r8.lightir.LIRBuilder addConstInt(int):41 -> a
     10:10:void lambda$build$0(com.android.tools.r8.graph.DexItem[],com.android.tools.r8.graph.DexItem,java.lang.Integer):49:49 -> a
     1:4:com.android.tools.r8.lightir.LIRCode build():47:50 -> b
-com.android.tools.r8.lightir.LIRCode -> com.android.tools.r8.internal.aC:
+com.android.tools.r8.lightir.LIRCode -> com.android.tools.r8.internal.gC:
     byte[] instructions -> b
     1:3:void <init>(com.android.tools.r8.graph.DexItem[],byte[]):18:20 -> <init>
     1:1:com.android.tools.r8.lightir.LIRBuilder builder():14:14 -> a
     1:1:com.android.tools.r8.lightir.LIRIterator iterator():25:25 -> b
     1:1:java.util.Iterator iterator():8:8 -> iterator
-com.android.tools.r8.lightir.LIRInstructionView -> com.android.tools.r8.internal.bC:
+com.android.tools.r8.lightir.LIRInstructionView -> com.android.tools.r8.internal.hC:
     void accept(com.android.tools.r8.lightir.LIRBasicInstructionCallback) -> a
-com.android.tools.r8.lightir.LIRIterator -> com.android.tools.r8.internal.cC:
+com.android.tools.r8.lightir.LIRIterator -> com.android.tools.r8.internal.iC:
     com.android.tools.r8.it.unimi.dsi.fastutil.bytes.ByteIterator iterator -> b
     int currentOpcode -> d
     int currentOperandSize -> e
@@ -98992,11 +99691,11 @@
     9:10:void com.android.tools.r8.lightir.LIRIterator.skip(int):53:54 -> j
     9:10:com.android.tools.r8.lightir.LIRInstructionView next():41 -> j
     1:1:java.lang.Object next():15:15 -> next
-com.android.tools.r8.lightir.LIROpcodes -> com.android.tools.r8.internal.eC:
-com.android.tools.r8.lightir.LIROpcodes$1 -> com.android.tools.r8.internal.dC:
+com.android.tools.r8.lightir.LIROpcodes -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.lightir.LIROpcodes$1 -> com.android.tools.r8.internal.jC:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
-com.android.tools.r8.lightir.LIRWriter -> com.android.tools.r8.internal.fC:
+com.android.tools.r8.lightir.LIRWriter -> com.android.tools.r8.internal.lC:
     com.android.tools.r8.lightir.ByteWriter writer -> a
     int pendingOperandBytes -> b
     boolean $assertionsDisabled -> c
@@ -99018,7 +99717,7 @@
     4:4:int com.android.tools.r8.lightir.ByteUtils.ensureU1(int):19:19 -> b
     4:4:void writeOperand(int):37 -> b
     5:5:void writeOperand(int):37:37 -> b
-com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.mE:
+com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.tE:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -99038,141 +99737,144 @@
     java.util.Map signatureMap -> c
     java.util.Set mapVersions -> d
     com.android.tools.r8.utils.BiMapContainer nameMapping -> b
-    boolean $assertionsDisabled -> e
-    int $r8$clinit -> f
+    boolean $assertionsDisabled -> f
+    int $r8$clinit -> g
     com.android.tools.r8.com.google.common.collect.ImmutableMap classNameMappings -> a
+    java.util.Map originalSourceFiles -> e
     1:1:void <clinit>():39:39 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,com.android.tools.r8.naming.ClassNameMapper$1):39:39 -> <init>
-    2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set):184:184 -> <init>
-    3:10:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set):179:186 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNameMapper$Builder builder():81:81 -> a
-    2:2:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path):85:85 -> a
-    3:9:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):90:96 -> a
-    10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):124:124 -> a
-    10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):96 -> a
-    11:11:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):106:106 -> a
+    1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,java.util.Map,com.android.tools.r8.naming.ClassNameMapper$1):39:39 -> <init>
+    2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,java.util.Map):186:186 -> <init>
+    3:13:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,java.util.Map):179:189 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNameMapper$Builder builder():82:82 -> a
+    2:2:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path):86:86 -> a
+    3:9:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):91:97 -> a
+    10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):125:125 -> a
+    10:10:com.android.tools.r8.naming.ClassNameMapper mapperFromFile(java.nio.file.Path,com.android.tools.r8.naming.ClassNameMapper$MissingFileAction):97 -> a
+    11:11:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):107:107 -> a
     12:15:java.io.BufferedReader com.android.tools.r8.com.google.common.io.CharSource.openBufferedStream():112:115 -> a
-    12:15:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):106 -> a
-    16:16:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):124:124 -> a
-    16:16:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):105 -> a
-    17:17:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):134:134 -> a
-    18:18:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):133:133 -> a
-    19:29:com.android.tools.r8.naming.ClassNameMapper mapperFromLineReader(com.android.tools.r8.naming.LineReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):146:146 -> a
-    30:40:com.android.tools.r8.naming.ClassNameMapper mapperFromLineReaderWithFiltering(com.android.tools.r8.naming.LineReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean,java.util.Set):165:165 -> a
-    41:45:java.lang.String deobfuscateClassName(java.lang.String):227:231 -> a
-    46:46:java.lang.String lambda$sorted$0(com.android.tools.r8.naming.ClassNamingForNameMapper):260:260 -> a
-    47:47:void write(com.android.tools.r8.utils.ChainableStringConsumer):282:282 -> a
-    48:48:java.util.Map getClassNameMappings():190:190 -> a
-    48:48:boolean verifyIsSorted():267 -> a
-    48:48:void write(com.android.tools.r8.utils.ChainableStringConsumer):282 -> a
-    49:51:boolean verifyIsSorted():267:269 -> a
-    49:51:void write(com.android.tools.r8.utils.ChainableStringConsumer):282 -> a
-    52:52:java.util.Map getClassNameMappings():190:190 -> a
-    52:52:boolean verifyIsSorted():269 -> a
-    52:52:void write(com.android.tools.r8.utils.ChainableStringConsumer):282 -> a
-    53:58:boolean verifyIsSorted():269:274 -> a
-    53:58:void write(com.android.tools.r8.utils.ChainableStringConsumer):282 -> a
-    59:59:java.util.Map getClassNameMappings():190:190 -> a
-    59:59:void write(com.android.tools.r8.utils.ChainableStringConsumer):283 -> a
-    60:61:void write(com.android.tools.r8.utils.ChainableStringConsumer):283:284 -> a
-    62:63:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):319:320 -> a
-    64:64:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):216:216 -> a
-    64:64:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):320 -> a
-    65:65:java.lang.String deobfuscateType(java.lang.String):235:235 -> a
-    65:65:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):216 -> a
-    65:65:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):320 -> a
-    66:66:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):217:217 -> a
-    66:66:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):320 -> a
-    67:71:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):194:198 -> a
-    67:71:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):217 -> a
-    67:71:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):320 -> a
-    72:72:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):217:217 -> a
-    72:72:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):320 -> a
-    73:75:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):320:322 -> a
-    76:79:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):203:206 -> a
-    76:79:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):322 -> a
-    80:80:java.lang.String deobfuscateType(java.lang.String):235:235 -> a
-    80:80:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):206 -> a
-    80:80:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):322 -> a
-    81:83:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):206:208 -> a
-    81:83:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):322 -> a
-    84:84:java.lang.String deobfuscateType(java.lang.String):235:235 -> a
-    84:84:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):208 -> a
-    84:84:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):322 -> a
-    85:85:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):210:210 -> a
-    85:85:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):322 -> a
-    86:90:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):194:198 -> a
-    86:90:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):212 -> a
-    86:90:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):322 -> a
-    91:91:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):212:212 -> a
-    91:91:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):322 -> a
-    92:96:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):322:326 -> a
-    97:106:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):331:340 -> a
-    107:107:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):344:344 -> a
-    108:111:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):203:206 -> a
-    108:111:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):345 -> a
-    112:112:java.lang.String deobfuscateType(java.lang.String):235:235 -> a
-    112:112:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):206 -> a
-    112:112:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):345 -> a
-    113:115:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):206:208 -> a
-    113:115:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):345 -> a
-    116:116:java.lang.String deobfuscateType(java.lang.String):235:235 -> a
-    116:116:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):208 -> a
-    116:116:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):345 -> a
-    117:117:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):210:210 -> a
-    117:117:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):345 -> a
-    118:122:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):194:198 -> a
-    118:122:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):212 -> a
-    118:122:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):345 -> a
-    123:123:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):212:212 -> a
-    123:123:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):345 -> a
-    124:132:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):346:354 -> a
-    133:133:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):358:358 -> a
-    134:134:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):216:216 -> a
-    134:134:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):359 -> a
-    135:135:java.lang.String deobfuscateType(java.lang.String):235:235 -> a
-    135:135:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):216 -> a
-    135:135:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):359 -> a
-    136:136:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):217:217 -> a
-    136:136:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):359 -> a
-    137:141:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):194:198 -> a
-    137:141:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):217 -> a
-    137:141:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):359 -> a
-    142:142:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):217:217 -> a
-    142:142:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):359 -> a
-    143:151:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):360:368 -> a
-    152:152:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):372:372 -> a
-    153:153:java.lang.String deobfuscateType(java.lang.String):235:235 -> a
-    153:153:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):372 -> a
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):251:251 -> b
-    2:2:java.util.Set getMapVersions():376:376 -> b
-    1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):100:100 -> c
-    2:5:java.io.BufferedReader com.android.tools.r8.com.google.common.io.CharSource.openBufferedStream():112:115 -> c
-    2:5:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):100 -> c
-    6:6:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):124:124 -> c
-    6:6:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):100 -> c
-    7:7:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():296:296 -> c
-    8:8:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableBiMap.builder():121:121 -> c
-    8:8:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():297 -> c
-    9:15:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():298:304 -> c
-    1:4:com.android.tools.r8.naming.ClassNameMapper sorted():259:262 -> d
-    1:2:boolean equals(java.lang.Object):309:310 -> equals
-    1:1:int hashCode():315:315 -> hashCode
-    1:3:java.lang.String toString():290:292 -> toString
+    12:15:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):107 -> a
+    16:16:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):125:125 -> a
+    16:16:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String,com.android.tools.r8.DiagnosticsHandler):106 -> a
+    17:17:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):135:135 -> a
+    18:18:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):134:134 -> a
+    19:29:com.android.tools.r8.naming.ClassNameMapper mapperFromLineReader(com.android.tools.r8.naming.LineReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):147:147 -> a
+    30:40:com.android.tools.r8.naming.ClassNameMapper mapperFromLineReaderWithFiltering(com.android.tools.r8.naming.LineReader,com.android.tools.r8.DiagnosticsHandler,boolean,boolean):165:165 -> a
+    41:45:java.lang.String deobfuscateClassName(java.lang.String):230:234 -> a
+    46:46:java.lang.String lambda$sorted$0(com.android.tools.r8.naming.ClassNamingForNameMapper):267:267 -> a
+    47:47:void write(com.android.tools.r8.utils.ChainableStringConsumer):289:289 -> a
+    48:48:java.util.Map getClassNameMappings():193:193 -> a
+    48:48:boolean verifyIsSorted():274 -> a
+    48:48:void write(com.android.tools.r8.utils.ChainableStringConsumer):289 -> a
+    49:51:boolean verifyIsSorted():274:276 -> a
+    49:51:void write(com.android.tools.r8.utils.ChainableStringConsumer):289 -> a
+    52:52:java.util.Map getClassNameMappings():193:193 -> a
+    52:52:boolean verifyIsSorted():276 -> a
+    52:52:void write(com.android.tools.r8.utils.ChainableStringConsumer):289 -> a
+    53:58:boolean verifyIsSorted():276:281 -> a
+    53:58:void write(com.android.tools.r8.utils.ChainableStringConsumer):289 -> a
+    59:59:java.util.Map getClassNameMappings():193:193 -> a
+    59:59:void write(com.android.tools.r8.utils.ChainableStringConsumer):290 -> a
+    60:61:void write(com.android.tools.r8.utils.ChainableStringConsumer):290:291 -> a
+    62:63:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):326:327 -> a
+    64:64:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):219:219 -> a
+    64:64:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):327 -> a
+    65:65:java.lang.String deobfuscateType(java.lang.String):238:238 -> a
+    65:65:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):219 -> a
+    65:65:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):327 -> a
+    66:66:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):220:220 -> a
+    66:66:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):327 -> a
+    67:71:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):197:201 -> a
+    67:71:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):220 -> a
+    67:71:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):327 -> a
+    72:72:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):220:220 -> a
+    72:72:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):327 -> a
+    73:75:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):327:329 -> a
+    76:79:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):206:209 -> a
+    76:79:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):329 -> a
+    80:80:java.lang.String deobfuscateType(java.lang.String):238:238 -> a
+    80:80:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):209 -> a
+    80:80:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):329 -> a
+    81:83:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):209:211 -> a
+    81:83:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):329 -> a
+    84:84:java.lang.String deobfuscateType(java.lang.String):238:238 -> a
+    84:84:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):211 -> a
+    84:84:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):329 -> a
+    85:85:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):213:213 -> a
+    85:85:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):329 -> a
+    86:90:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):197:201 -> a
+    86:90:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):215 -> a
+    86:90:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):329 -> a
+    91:91:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):215:215 -> a
+    91:91:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):329 -> a
+    92:96:java.lang.String originalNameOf(com.android.tools.r8.graph.IndexedDexItem):329:333 -> a
+    97:106:java.lang.String lookupName(com.android.tools.r8.naming.MemberNaming$Signature,com.android.tools.r8.graph.DexType):338:347 -> a
+    107:107:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):351:351 -> a
+    108:111:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):206:209 -> a
+    108:111:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):352 -> a
+    112:112:java.lang.String deobfuscateType(java.lang.String):238:238 -> a
+    112:112:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):209 -> a
+    112:112:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):352 -> a
+    113:115:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):209:211 -> a
+    113:115:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):352 -> a
+    116:116:java.lang.String deobfuscateType(java.lang.String):238:238 -> a
+    116:116:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):211 -> a
+    116:116:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):352 -> a
+    117:117:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):213:213 -> a
+    117:117:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):352 -> a
+    118:122:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):197:201 -> a
+    118:122:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):215 -> a
+    118:122:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):352 -> a
+    123:123:com.android.tools.r8.naming.MemberNaming$MethodSignature getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):215:215 -> a
+    123:123:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):352 -> a
+    124:132:com.android.tools.r8.naming.MemberNaming$MethodSignature originalSignatureOf(com.android.tools.r8.graph.DexMethod):353:361 -> a
+    133:133:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):365:365 -> a
+    134:134:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):219:219 -> a
+    134:134:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):366 -> a
+    135:135:java.lang.String deobfuscateType(java.lang.String):238:238 -> a
+    135:135:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):219 -> a
+    135:135:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):366 -> a
+    136:136:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):220:220 -> a
+    136:136:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):366 -> a
+    137:141:com.android.tools.r8.naming.MemberNaming$Signature canonicalizeSignature(com.android.tools.r8.naming.MemberNaming$Signature):197:201 -> a
+    137:141:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):220 -> a
+    137:141:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):366 -> a
+    142:142:com.android.tools.r8.naming.MemberNaming$FieldSignature getRenamedFieldSignature(com.android.tools.r8.graph.DexField):220:220 -> a
+    142:142:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):366 -> a
+    143:151:com.android.tools.r8.naming.MemberNaming$FieldSignature originalSignatureOf(com.android.tools.r8.graph.DexField):367:375 -> a
+    152:152:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):379:379 -> a
+    153:153:java.lang.String deobfuscateType(java.lang.String):238:238 -> a
+    153:153:java.lang.String originalNameOf(com.android.tools.r8.graph.DexType):379 -> a
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):258:258 -> b
+    2:2:java.util.Set getMapVersions():383:383 -> b
+    1:1:java.lang.String getSourceFile(java.lang.String):242:242 -> c
+    2:2:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():303:303 -> c
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableBiMap.builder():121:121 -> c
+    3:3:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():304 -> c
+    4:10:com.android.tools.r8.utils.BiMapContainer getObfuscatedToOriginalMapping():305:311 -> c
+    1:1:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):101:101 -> d
+    2:5:java.io.BufferedReader com.android.tools.r8.com.google.common.io.CharSource.openBufferedStream():112:115 -> d
+    2:5:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):101 -> d
+    6:6:com.android.tools.r8.naming.ClassNameMapper mapperFromBufferedReader(java.io.BufferedReader,com.android.tools.r8.DiagnosticsHandler):125:125 -> d
+    6:6:com.android.tools.r8.naming.ClassNameMapper mapperFromString(java.lang.String):101 -> d
+    7:10:com.android.tools.r8.naming.ClassNameMapper sorted():266:269 -> d
+    1:2:boolean equals(java.lang.Object):316:317 -> equals
+    1:1:int hashCode():322:322 -> hashCode
+    1:3:java.lang.String toString():297:299 -> toString
 com.android.tools.r8.naming.ClassNameMapper$Builder -> com.android.tools.r8.naming.b$a:
     java.util.Map mapping -> a
+    java.util.Map originalSourceFiles -> c
     java.util.LinkedHashSet mapVersions -> b
-    1:4:void <init>():46:49 -> <init>
+    1:5:void <init>():46:50 -> <init>
     1:1:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):46:46 -> a
-    2:2:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):55:55 -> a
-    3:3:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder com.android.tools.r8.naming.ClassNamingForNameMapper.builder(java.lang.String,java.lang.String):209:209 -> a
-    3:3:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):55 -> a
-    4:4:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):56:56 -> a
-    5:5:com.android.tools.r8.naming.ClassNameMapper build():62:62 -> a
-    6:6:java.lang.String lambda$buildClassNameMappings$0(com.android.tools.r8.naming.ClassNamingForNameMapper):67:67 -> a
-    7:7:void lambda$buildClassNameMappings$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$Builder):69:69 -> a
-    8:8:com.android.tools.r8.naming.ProguardMap$Builder setCurrentMapVersion(com.android.tools.r8.naming.mappinginformation.MapVersionMappingInformation):75:75 -> a
-    1:5:com.android.tools.r8.com.google.common.collect.ImmutableMap buildClassNameMappings():66:70 -> b
+    2:3:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):55:56 -> a
+    4:4:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder com.android.tools.r8.naming.ClassNamingForNameMapper.builder(java.lang.String,java.lang.String,java.util.function.BiConsumer):221:221 -> a
+    4:4:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):56 -> a
+    5:5:com.android.tools.r8.naming.ClassNamingForNameMapper$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):57:57 -> a
+    6:6:com.android.tools.r8.naming.ClassNameMapper build():63:63 -> a
+    7:7:java.lang.String lambda$buildClassNameMappings$0(com.android.tools.r8.naming.ClassNamingForNameMapper):68:68 -> a
+    8:8:void lambda$buildClassNameMappings$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$Builder):70:70 -> a
+    9:9:com.android.tools.r8.naming.ProguardMap$Builder setCurrentMapVersion(com.android.tools.r8.naming.mappinginformation.MapVersionMappingInformation):76:76 -> a
+    1:5:com.android.tools.r8.com.google.common.collect.ImmutableMap buildClassNameMappings():67:71 -> b
 com.android.tools.r8.naming.ClassNameMapper$MissingFileAction -> com.android.tools.r8.naming.b$b:
     com.android.tools.r8.naming.ClassNameMapper$MissingFileAction MISSING_FILE_IS_EMPTY_MAP -> b
     com.android.tools.r8.naming.ClassNameMapper$MissingFileAction MISSING_FILE_IS_ERROR -> c
@@ -99319,32 +100021,33 @@
     java.util.Map mappedRangesByRenamedName -> e
     java.lang.String renamedName -> b
     java.util.Map mappedFieldNamingsByName -> f
-    1:1:void <clinit>():35:35 -> <clinit>
-    1:1:void <init>(java.lang.String,java.lang.String,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.List,com.android.tools.r8.naming.ClassNamingForNameMapper$1):35:35 -> <init>
-    2:9:void <init>(java.lang.String,java.lang.String,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.List):238:245 -> <init>
+    1:1:void <clinit>():36:36 -> <clinit>
+    1:1:void <init>(java.lang.String,java.lang.String,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.List,com.android.tools.r8.naming.ClassNamingForNameMapper$1):36:36 -> <init>
+    2:9:void <init>(java.lang.String,java.lang.String,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.List):250:257 -> <init>
     1:1:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":340,"2":341,"3":342}}
-    340:340:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):338:338 -> a
-    341:341:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):338:338 -> a
-    342:342:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):338:338 -> a
-    339:339:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):338:338 -> a
-    343:343:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName getMappedRangesForRenamedName(java.lang.String):253:253 -> a
-    344:350:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):258:264 -> a
-    351:351:java.util.Collection allFieldNamings():319:319 -> a
-    352:358:void write(com.android.tools.r8.utils.ChainableStringConsumer):335:341 -> a
-    359:360:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):313:314 -> a
-    359:360:void write(com.android.tools.r8.utils.ChainableStringConsumer):341 -> a
-    361:369:void write(com.android.tools.r8.utils.ChainableStringConsumer):345:353 -> a
-    370:370:void lambda$write$1(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.MemberNaming):341:341 -> a
-    371:371:int lambda$write$2(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):349:349 -> a
-    1:11:com.android.tools.r8.naming.MemberNaming lookupByOriginalSignature(com.android.tools.r8.naming.MemberNaming$Signature):270:280 -> b
-    12:20:java.util.List lookupByOriginalName(java.lang.String):289:297 -> b
-    21:21:java.util.Collection allMethodNamings():331:331 -> b
-    1:1:java.util.List getAdditionalMappingInfo():249:249 -> c
-    1:11:boolean equals(java.lang.Object):370:380 -> equals
-    1:5:int hashCode():385:389 -> hashCode
-    1:3:java.lang.String toString():360:362 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":352,"2":353,"3":354}}
+    352:352:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):350:350 -> a
+    353:353:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):350:350 -> a
+    354:354:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):350:350 -> a
+    351:351:void lambda$write$0(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.mappinginformation.MappingInformation):350:350 -> a
+    355:355:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName getMappedRangesForRenamedName(java.lang.String):265:265 -> a
+    356:362:com.android.tools.r8.naming.MemberNaming lookup(com.android.tools.r8.naming.MemberNaming$Signature):270:276 -> a
+    363:363:java.util.Collection allFieldNamings():331:331 -> a
+    364:370:void write(com.android.tools.r8.utils.ChainableStringConsumer):347:353 -> a
+    371:372:void forAllFieldNaming(com.android.tools.r8.utils.ThrowingConsumer):325:326 -> a
+    371:372:void write(com.android.tools.r8.utils.ChainableStringConsumer):353 -> a
+    373:381:void write(com.android.tools.r8.utils.ChainableStringConsumer):357:365 -> a
+    382:382:void lambda$write$1(com.android.tools.r8.utils.ChainableStringConsumer,com.android.tools.r8.naming.MemberNaming):353:353 -> a
+    383:383:int lambda$write$2(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):361:361 -> a
+    1:11:com.android.tools.r8.naming.MemberNaming lookupByOriginalSignature(com.android.tools.r8.naming.MemberNaming$Signature):282:292 -> b
+    12:20:java.util.List lookupByOriginalName(java.lang.String):301:309 -> b
+    21:21:java.util.Collection allMethodNamings():343:343 -> b
+    1:1:java.util.List getAdditionalMappingInfo():261:261 -> c
+    1:11:boolean equals(java.lang.Object):382:392 -> equals
+    1:5:int hashCode():397:401 -> hashCode
+    1:3:java.lang.String toString():372:374 -> toString
 com.android.tools.r8.naming.ClassNamingForNameMapper$Builder -> com.android.tools.r8.naming.k$a:
+    java.util.function.BiConsumer originalSourceFileConsumer -> h
     java.util.Map methodMembers -> c
     java.util.Map fieldMembers -> d
     java.lang.String originalName -> a
@@ -99352,17 +100055,20 @@
     java.util.Map mappedRangesByName -> e
     java.lang.String renamedName -> b
     java.util.Map mappedFieldNamingsByName -> f
-    1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):37:37 -> <init>
-    2:2:void <init>(java.lang.String,java.lang.String):47:47 -> <init>
-    3:11:void <init>(java.lang.String,java.lang.String):41:49 -> <init>
-    1:10:com.android.tools.r8.naming.ClassNamingForNameMapper build():69:78 -> a
+    1:1:void <init>(java.lang.String,java.lang.String,java.util.function.BiConsumer,com.android.tools.r8.naming.ClassNamingForNameMapper$1):38:38 -> <init>
+    2:2:void <init>(java.lang.String,java.lang.String,java.util.function.BiConsumer):52:52 -> <init>
+    3:16:void <init>(java.lang.String,java.lang.String,java.util.function.BiConsumer):42:55 -> <init>
+    1:10:com.android.tools.r8.naming.ClassNamingForNameMapper build():75:84 -> a
     11:11:boolean com.android.tools.r8.naming.MemberNaming.isMethodNaming():87:87 -> a
-    11:11:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):54 -> a
-    12:17:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):55:60 -> a
-    18:20:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,java.lang.String):95:97 -> a
-    21:21:java.util.List lambda$addMappedRange$1(java.lang.String):97:97 -> a
-    22:28:void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):104:110 -> a
-    1:1:java.util.List lambda$addMemberEntry$0(java.lang.String):59:59 -> b
+    11:11:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):60 -> a
+    12:17:com.android.tools.r8.naming.ClassNaming$Builder addMemberEntry(com.android.tools.r8.naming.MemberNaming):61:66 -> a
+    18:20:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange addMappedRange(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,java.lang.String):101:103 -> a
+    21:21:java.util.List lambda$addMappedRange$1(java.lang.String):103:103 -> a
+    22:29:void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):110:117 -> a
+    30:30:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isFileNameInformation():0:0 -> a
+    30:30:void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):117 -> a
+    31:31:void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):118:118 -> a
+    1:1:java.util.List lambda$addMemberEntry$0(java.lang.String):65:65 -> b
 com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange -> com.android.tools.r8.naming.k$b:
     com.android.tools.r8.naming.Range originalRange -> c
     java.util.List additionalMappingInfo -> f
@@ -99372,49 +100078,49 @@
     boolean $assertionsDisabled -> h
     com.android.tools.r8.naming.MemberNaming$MethodSignature signature -> b
     java.lang.String renamedName -> d
-    1:3:void <clinit>():411:413 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):411:411 -> <init>
-    2:2:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,java.lang.String):433:433 -> <init>
-    3:12:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,java.lang.String):428:437 -> <init>
-    1:1:java.util.List access$400(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):411:411 -> a
-    2:2:int getNextSequenceNumber():416:416 -> a
-    3:9:void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):442:448 -> a
-    10:14:int getOriginalLineNumber(int):493:497 -> a
+    1:3:void <clinit>():423:425 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,java.lang.String,com.android.tools.r8.naming.ClassNamingForNameMapper$1):423:423 -> <init>
+    2:2:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,java.lang.String):445:445 -> <init>
+    3:12:void <init>(com.android.tools.r8.naming.Range,com.android.tools.r8.naming.MemberNaming$MethodSignature,com.android.tools.r8.naming.Range,java.lang.String):440:449 -> <init>
+    1:1:java.util.List access$400(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):423:423 -> a
+    2:2:int getNextSequenceNumber():428:428 -> a
+    3:9:void addMappingInformation(com.android.tools.r8.naming.mappinginformation.MappingInformation,java.util.function.Consumer):454:460 -> a
+    10:14:int getOriginalLineNumber(int):505:509 -> a
     15:15:boolean com.android.tools.r8.naming.Range.contains(int):31:31 -> a
-    15:15:int getOriginalLineNumber(int):497 -> a
-    16:26:int getOriginalLineNumber(int):497:507 -> a
-    1:1:int access$500(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):411:411 -> b
-    2:2:java.util.List getOutlineCallsiteInformation():481:481 -> b
-    3:9:java.util.List filter(java.util.function.Predicate,java.util.function.Function):471:477 -> b
-    3:9:java.util.List getOutlineCallsiteInformation():481 -> b
-    1:1:java.util.List getRewriteFrameMappingInformation():487:487 -> c
-    2:8:java.util.List filter(java.util.function.Predicate,java.util.function.Function):471:477 -> c
-    2:8:java.util.List getRewriteFrameMappingInformation():487 -> c
-    1:2:boolean isCompilerSynthesized():452:453 -> d
+    15:15:int getOriginalLineNumber(int):509 -> a
+    16:26:int getOriginalLineNumber(int):509:519 -> a
+    1:1:int access$500(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):423:423 -> b
+    2:2:java.util.List getOutlineCallsiteInformation():493:493 -> b
+    3:9:java.util.List filter(java.util.function.Predicate,java.util.function.Function):483:489 -> b
+    3:9:java.util.List getOutlineCallsiteInformation():493 -> b
+    1:1:java.util.List getRewriteFrameMappingInformation():499:499 -> c
+    2:8:java.util.List filter(java.util.function.Predicate,java.util.function.Function):483:489 -> c
+    2:8:java.util.List getRewriteFrameMappingInformation():499 -> c
+    1:2:boolean isCompilerSynthesized():464:465 -> d
     3:3:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isOutlineMappingInformation():0:0 -> d
-    3:3:boolean isCompilerSynthesized():453 -> d
-    1:2:boolean isOutlineFrame():461:462 -> e
+    3:3:boolean isCompilerSynthesized():465 -> d
+    1:2:boolean isOutlineFrame():473:474 -> e
     3:3:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isOutlineMappingInformation():0:0 -> e
-    3:3:boolean isOutlineFrame():462 -> e
-    1:10:boolean equals(java.lang.Object):540:549 -> equals
-    1:4:int hashCode():555:558 -> hashCode
-    1:10:java.lang.String toString():521:530 -> toString
+    3:3:boolean isOutlineFrame():474 -> e
+    1:10:boolean equals(java.lang.Object):552:561 -> equals
+    1:4:int hashCode():567:570 -> hashCode
+    1:10:java.lang.String toString():533:542 -> toString
 com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName -> com.android.tools.r8.naming.k$c:
     java.util.List mappedRanges -> a
-    1:2:void <init>(java.util.List):118:119 -> <init>
-    1:1:java.util.List access$300(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):115:115 -> a
-    2:2:java.util.List allRangesForLine(int):149:149 -> a
-    3:5:java.util.List allRangesForLine(int,boolean):162:164 -> a
+    1:2:void <init>(java.util.List):127:128 -> <init>
+    1:1:java.util.List access$300(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRangesOfName):124:124 -> a
+    2:2:java.util.List allRangesForLine(int):158:158 -> a
+    3:5:java.util.List allRangesForLine(int,boolean):171:173 -> a
     6:6:boolean com.android.tools.r8.naming.Range.contains(int):31:31 -> a
-    6:6:java.util.List allRangesForLine(int,boolean):170 -> a
-    7:15:java.util.List allRangesForLine(int,boolean):173:181 -> a
-    16:16:java.util.List getMappedRanges():185:185 -> a
-    1:2:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):128:129 -> b
+    6:6:java.util.List allRangesForLine(int,boolean):179 -> a
+    7:15:java.util.List allRangesForLine(int,boolean):182:190 -> a
+    16:16:java.util.List getMappedRanges():194:194 -> a
+    1:2:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):137:138 -> b
     3:3:boolean com.android.tools.r8.naming.Range.contains(int):31:31 -> b
-    3:3:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):135 -> b
-    1:7:boolean equals(java.lang.Object):193:199 -> equals
-    1:1:int hashCode():204:204 -> hashCode
-com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.Qh:
+    3:3:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):144 -> b
+    1:7:boolean equals(java.lang.Object):202:208 -> equals
+    1:1:int hashCode():213:213 -> hashCode
+com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.Uh:
     java.nio.file.Path path -> c
     java.io.BufferedReader reader -> b
     boolean $assertionsDisabled -> d
@@ -99463,9 +100169,9 @@
     106:106:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):93:93 -> a
     106:106:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):205 -> a
     107:109:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):206:208 -> a
-    110:110:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> a
+    110:110:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> a
     110:110:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):208 -> a
-    111:111:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> a
+    111:111:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> a
     111:111:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):208 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     112:113:void lambda$renameFieldsInClasses$5(java.util.Map,com.android.tools.r8.graph.DexClass):211:212 -> a
@@ -99474,9 +100180,9 @@
     124:124:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):93:93 -> a
     124:124:void renameFieldsInInterfacePartition(java.util.Set):246 -> a
     125:141:void renameFieldsInInterfacePartition(java.util.Set):248:264 -> a
-    142:142:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> a
+    142:142:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> a
     142:142:void renameFieldsInInterfacePartition(java.util.Set):265 -> a
-    143:143:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> a
+    143:143:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> a
     143:143:void renameFieldsInInterfacePartition(java.util.Set):265 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     144:145:void lambda$renameFieldsInInterfacePartition$7(com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState,com.android.tools.r8.naming.ReservedFieldNamingState):254:255 -> a
@@ -99630,7 +100336,7 @@
     5:12:void lambda$replaceDexItemBasedConstString$1(com.android.tools.r8.graph.DexProgramClass):142 -> b
     13:13:void lambda$replaceDexItemBasedConstString$1(com.android.tools.r8.graph.DexProgramClass):144:144 -> b
     1:4:void run(java.util.concurrent.ExecutorService):54:57 -> c
-com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.Co:
+com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.Ho:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> b
     boolean $assertionsDisabled -> c
@@ -99706,7 +100412,7 @@
     774:774: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):374:374 -> a
     775:775: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):374:374 -> a
     761:772: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):374:385 -> a
-com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.Fo:
+com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.Ko:
     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
@@ -100049,15 +100755,15 @@
     int getDictionaryIndex() -> a
     int incrementDictionaryIndex() -> b
     int incrementNameIndex() -> c
-com.android.tools.r8.naming.LineReader -> com.android.tools.r8.internal.FD:
+com.android.tools.r8.naming.LineReader -> com.android.tools.r8.internal.MD:
     1:1:com.android.tools.r8.naming.LineReader fromBufferedReader(java.io.BufferedReader):18:18 -> a
-com.android.tools.r8.naming.LineReader$BufferedLineReader -> com.android.tools.r8.internal.ED:
+com.android.tools.r8.naming.LineReader$BufferedLineReader -> com.android.tools.r8.internal.LD:
     java.io.BufferedReader bufferedReader -> a
     1:1:void <init>(java.io.BufferedReader,com.android.tools.r8.naming.LineReader$1):21:21 -> <init>
     2:3:void <init>(java.io.BufferedReader):25:26 -> <init>
     1:1:void close():36:36 -> close
     1:1:java.lang.String readLine():31:31 -> readLine
-com.android.tools.r8.naming.MapVersion -> com.android.tools.r8.internal.lF:
+com.android.tools.r8.naming.MapVersion -> com.android.tools.r8.internal.sF:
     com.android.tools.r8.naming.MapVersion[] $VALUES -> h
     com.android.tools.r8.naming.MapVersion MAP_VERSION_UNKNOWN -> g
     com.android.tools.r8.naming.MapVersion MAP_VERSION_EXPERIMENTAL -> f
@@ -100213,20 +100919,20 @@
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):93:93 -> b
     2:2:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):159:159 -> b
     3:3:java.util.function.Function getNamingKeyTransform():167:167 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> b
     4:4:java.util.function.Function getNamingKeyTransform():167 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> b
     5:5:java.util.function.Function getNamingKeyTransform():167 -> b
     6:7:java.util.function.Function getNamingKeyTransform():168:169 -> b
     8:20:void lambda$reserveNamesInClasses$6(com.android.tools.r8.graph.DexClass):289:301 -> b
     21:21:void lambda$reserveNamesInClasses$6(com.android.tools.r8.graph.DexClass):298:298 -> b
     1:1:com.android.tools.r8.naming.MethodReservationState access$300(com.android.tools.r8.naming.MethodNameMinifier):93:93 -> c
     2:3:java.util.function.Function getReservationKeyTransform():156:157 -> c
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> c
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> c
     4:4:java.util.function.Function getReservationKeyTransform():157 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> c
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> c
     5:5:java.util.function.Function getReservationKeyTransform():157 -> c
     6:9:java.util.function.Function getReservationKeyTransform():159:162 -> c
     10:10:java.lang.Object lambda$getReservationKeyTransform$1(com.android.tools.r8.graph.DexMethod):162:162 -> c
@@ -100334,7 +101040,7 @@
     1:1:void <clinit>():38:38 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):42:43 -> <init>
     1:2:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):47:48 -> a
-    3:3:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():1563:1563 -> a
+    3:3:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():1518:1518 -> a
     3:3:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):48 -> a
     4:44:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):49:89 -> a
     45:53:java.util.List computeReachableInterfacesWithDeterministicOrder(com.android.tools.r8.graph.SubtypingInfo):96:104 -> a
@@ -100511,10 +101217,10 @@
     1:1:void <clinit>():181:181 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):185:186 -> <init>
     1:7:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):195:201 -> c
-    8:8:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):536:536 -> c
+    8:8:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):540:540 -> c
     8:8:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):201 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:12:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):536:539 -> c
+    9:12:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexString.toArrayDescriptor(int,com.android.tools.r8.graph.DexItemFactory):540:543 -> c
     9:12:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):201 -> c
     13:14:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):203:204 -> c
     15:15:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):196:196 -> c
@@ -100675,7 +101381,7 @@
     16:16:void reportReservationError(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexString):556:556 -> a
     16:16:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):481 -> a
     17:22:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):485:490 -> a
-    23:23:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    23:23:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     23:23:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):490 -> a
     24:24:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):490:490 -> a
     25:29:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):499:503 -> a
@@ -100948,7 +101654,7 @@
     1233:1233:java.lang.String toString():613:613 -> toString
     1234:1234:java.lang.String toString():613:613 -> toString
     1227:1227:java.lang.String toString():613:613 -> toString
-com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.MP:
+com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.eQ:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     com.android.tools.r8.utils.InternalOptions options -> c
     com.android.tools.r8.utils.Reporter reporter -> d
@@ -100993,11 +101699,11 @@
     13:15:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():81 -> a
     19:21:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):118:120 -> a
     19:21:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():81 -> a
-    22:22:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1950:1950 -> a
+    22:22:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1926:1926 -> a
     22:22:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):120 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     22:22:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():81 -> a
-    23:25:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1950:1952 -> a
+    23:25:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1926:1928 -> a
     23:25:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):120 -> a
     23:25:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():81 -> a
     26:30:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):121:125 -> a
@@ -101016,11 +101722,11 @@
     43:43:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():82 -> a
     44:44:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():83:83 -> a
     1:1:com.android.tools.r8.StringConsumer access$200(com.android.tools.r8.naming.ProguardMapSupplier):23:23 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.MP$a:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.eQ$a:
     1:29:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker$VerifyMappingFileHashResult validateProguardMapHash(java.lang.String):257:285 -> a
     1:1:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):196:196 -> accept
     1:1:void finished(com.android.tools.r8.DiagnosticsHandler):202:202 -> finished
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker$VerifyMappingFileHashResult -> com.android.tools.r8.internal.MP$a$a:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker$VerifyMappingFileHashResult -> com.android.tools.r8.internal.eQ$a$a:
     boolean error -> a
     java.lang.String message -> b
     boolean $assertionsDisabled -> c
@@ -101032,7 +101738,7 @@
     2:3:java.lang.String getMessage():248:249 -> b
     1:1:boolean isError():244:244 -> c
     1:1:boolean isOk():240:240 -> d
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.NP:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.fQ:
     java.lang.String id -> a
     java.lang.String hash -> b
     boolean $assertionsDisabled -> c
@@ -101041,7 +101747,7 @@
     2:6:void <init>(java.lang.String,java.lang.String):41:45 -> <init>
     1:1:java.lang.String getHash():55:55 -> a
     1:1:java.lang.String getId():50:50 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.PP:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.hQ:
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
     1:3:void <init>():140:142 -> <init>
     1:1:java.lang.String lambda$getProviderOrDefault$0(com.android.tools.r8.MapIdEnvironment):147:147 -> a
@@ -101052,16 +101758,16 @@
     5:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build(com.android.tools.r8.MapIdProvider):167 -> a
     6:7:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build(com.android.tools.r8.MapIdProvider):167:168 -> a
     1:1:com.android.tools.r8.MapIdProvider getProviderOrDefault(com.android.tools.r8.MapIdProvider):147:147 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder$1 -> com.android.tools.r8.internal.OP:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder$1 -> com.android.tools.r8.internal.gQ:
     java.lang.String val$hash -> a
     1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder,java.lang.String):151:151 -> <init>
     1:1:java.lang.String getMapHash():154:154 -> getMapHash
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.QP:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.iQ:
     com.android.tools.r8.naming.ProguardMapSupplier this$0 -> a
     1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier):172:172 -> <init>
     1:1:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter.accept(java.lang.String):176:176 -> a
     1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):172 -> a
-com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.cS:
+com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.xS:
     int to -> b
     boolean isCardinal -> c
     int from -> a
@@ -101174,7 +101880,7 @@
     6:7:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):59:60 -> a
     6:7:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):40 -> a
     8:9:com.android.tools.r8.naming.SeedMapper build():73:74 -> a
-com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.VX:
+com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.qY:
     1:2:com.android.tools.r8.SourceFileProvider computeSourceFileProvider(com.android.tools.r8.SourceFileProvider,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.InternalOptions):20:21 -> a
     3:3:com.android.tools.r8.SourceFileProvider com.android.tools.r8.naming.SourceFileRewriter.rewriteToDefaultSourceFile(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     3:3:com.android.tools.r8.SourceFileProvider computeSourceFileProvider(com.android.tools.r8.SourceFileProvider,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.InternalOptions):21 -> a
@@ -101211,13 +101917,13 @@
     18:18:com.android.tools.r8.SourceFileProvider com.android.tools.r8.naming.SourceFileRewriter.rewriteToDefaultSourceFile(com.android.tools.r8.graph.DexItemFactory):61 -> a
     18:18:com.android.tools.r8.SourceFileProvider com.android.tools.r8.naming.SourceFileRewriter.computeNonCompatProvider(com.android.tools.r8.utils.InternalOptions):46 -> a
     18:18:com.android.tools.r8.SourceFileProvider computeSourceFileProvider(com.android.tools.r8.SourceFileProvider,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.InternalOptions):26 -> a
-com.android.tools.r8.naming.SourceFileRewriter$1 -> com.android.tools.r8.internal.UX:
+com.android.tools.r8.naming.SourceFileRewriter$1 -> com.android.tools.r8.internal.pY:
     java.lang.String val$renaming -> a
     boolean val$allowDiscard -> b
     1:1:void <init>(java.lang.String,boolean):65:65 -> <init>
     1:1:boolean allowDiscardingSourceFile():73:73 -> allowDiscardingSourceFile
     1:1:java.lang.String get(com.android.tools.r8.SourceFileEnvironment):68:68 -> get
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.Qa:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.Ta:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo TYPE_NAME_INSTANCE -> g
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo SIMPLE_NAME_INSTANCE -> f
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping mapping -> b
@@ -101258,7 +101964,7 @@
     2:2:boolean needsToRegisterReference():149 -> f
     1:1:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo none():139:139 -> g
     1:1:int hashCode():183:183 -> hashCode
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.Pa:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.Sa:
     boolean $assertionsDisabled -> g
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NONE -> b
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NAME -> c
@@ -101285,7 +101991,7 @@
     190:190: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
     191:191: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
     192:230: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.zk:
+com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.Ek:
     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>
@@ -101293,7 +101999,7 @@
     boolean needsToComputeName() -> e
     boolean needsToRegisterReference() -> f
     1:1:com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo forFieldName():21:21 -> g
-com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.iI:
+com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.pI:
     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
@@ -101311,7 +102017,7 @@
     boolean isRecordFieldNamesComputationInfo() -> d
     boolean needsToComputeName() -> e
     boolean needsToRegisterReference() -> f
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo -> com.android.tools.r8.internal.BS:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo -> com.android.tools.r8.internal.WS:
     com.android.tools.r8.graph.DexField[] fields -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():38:38 -> <clinit>
@@ -101333,7 +102039,7 @@
     boolean isRecordFieldNamesComputationInfo() -> d
     boolean needsToComputeName() -> e
     boolean needsToRegisterReference() -> f
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.zS:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.US:
     1:1:void <init>(com.android.tools.r8.graph.DexField[]):70:70 -> <init>
     1:1:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):79:79 -> a
     2:2:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):84:84 -> a
@@ -101345,29 +102051,29 @@
     6:10:com.android.tools.r8.graph.DexField com.android.tools.r8.naming.NamingLens.lookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexItemFactory):91:91 -> a
     6:10:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):85 -> a
     11:14:java.lang.String lambda$internalComputeNameFor$0(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,int):85:88 -> a
-com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.AS:
+com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$MissMatchingRecordFieldNamesComputationInfo -> com.android.tools.r8.internal.VS:
     java.lang.String[] fieldNames -> c
     1:1:void <init>(java.lang.String[],com.android.tools.r8.graph.DexField[],com.android.tools.r8.naming.dexitembasedstring.RecordFieldNamesComputationInfo$1):46:46 -> <init>
     2:3:void <init>(java.lang.String[],com.android.tools.r8.graph.DexField[]):52:53 -> <init>
     1:1:com.android.tools.r8.graph.DexString internalComputeNameFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):62:62 -> a
     2:2:java.lang.String lambda$internalComputeNameFor$0(int):62:62 -> a
-com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.ea:
+com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.ha:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():685:685 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():690:690 -> a
     1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Oa:
+com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Ra:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
     boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Eh:
+com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Ih:
     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.Kh:
+com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Oh:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
     boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.Bo:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.Go:
     com.android.tools.r8.graph.DexReference reference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():13:13 -> <clinit>
@@ -101380,17 +102086,17 @@
     3:3:com.android.tools.r8.graph.DexReference getReference():56:56 -> b
     boolean isTypeResult() -> c
     1:1:com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult fromDexTypeBasedConstString(com.android.tools.r8.graph.DexType):33:33 -> c
-com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.Do:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.Io:
     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.Eo:
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult -> com.android.tools.r8.internal.Jo:
     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 isTypeResult() -> c
     boolean isTypeInitializedFromUse() -> d
-com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.i30:
+com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.E30:
     1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
-com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.internal.Zc:
+com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation -> com.android.tools.r8.internal.cd:
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>(com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$1):12:12 -> <init>
@@ -101406,7 +102112,7 @@
     5:5:boolean allowOther(com.android.tools.r8.naming.mappinginformation.MappingInformation):51:51 -> a
     boolean isCompilerSynthesizedMappingInformation() -> f
     1:3:java.lang.String serialize():56:58 -> i
-com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder -> com.android.tools.r8.internal.Yc:
+com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation$Builder -> com.android.tools.r8.internal.bd:
     1:1:com.android.tools.r8.naming.mappinginformation.CompilerSynthesizedMappingInformation build():20:20 -> a
 com.android.tools.r8.naming.mappinginformation.FileNameInformation -> com.android.tools.r8.naming.mappinginformation.a:
     java.lang.String fileName -> a
@@ -101472,7 +102178,7 @@
     1:1:com.android.tools.r8.origin.Origin getOrigin():21:21 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():26:26 -> getPosition
     1:1:com.android.tools.r8.naming.mappinginformation.MappingInformationDiagnostics notAllowedCombination(com.android.tools.r8.naming.mappinginformation.MappingInformation,com.android.tools.r8.naming.mappinginformation.MappingInformation,int):98:98 -> notAllowedCombination
-com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation -> com.android.tools.r8.internal.fN:
+com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation -> com.android.tools.r8.internal.wN:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap positions -> a
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> b
     1:1:void <clinit>():17:17 -> <clinit>
@@ -101505,7 +102211,7 @@
     120:120:void lambda$deserialize$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.util.Map$Entry):92:92 -> a
     com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation asOutlineCallsiteInformation() -> c
     1:9:java.lang.String serialize():35:43 -> i
-com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation -> com.android.tools.r8.internal.hN:
+com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation -> com.android.tools.r8.internal.yN:
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -101514,7 +102220,7 @@
     1:1:void deserialize(com.android.tools.r8.naming.MapVersion,java.util.function.Consumer):44 -> a
     2:2:void deserialize(com.android.tools.r8.naming.MapVersion,java.util.function.Consumer):45:45 -> a
     1:3:java.lang.String serialize():24:26 -> i
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation -> com.android.tools.r8.internal.eW:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation -> com.android.tools.r8.internal.zW:
     java.util.List actions -> b
     java.util.List conditions -> a
     com.android.tools.r8.naming.MapVersion SUPPORTED_VERSION -> c
@@ -101716,18 +102422,18 @@
     1:9:java.lang.String serialize():57:65 -> i
     1:1:java.util.List getActions():47:47 -> j
     1:1:java.util.List getConditions():43:43 -> k
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder -> com.android.tools.r8.internal.ZV:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder -> com.android.tools.r8.internal.uW:
     java.util.List actions -> b
     java.util.List conditions -> a
     1:4:void <init>():112:115 -> <init>
     1:1:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder addCondition(com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition):118:118 -> a
     2:2:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder addRewriteAction(com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction):123:123 -> a
     3:3:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation build():128:128 -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition -> com.android.tools.r8.internal.aW:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Condition -> com.android.tools.r8.internal.vW:
     1:1:void <init>():132:132 -> <init>
     boolean evaluate(com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl) -> a
     com.android.tools.r8.com.google.gson.JsonPrimitive serialize() -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction -> com.android.tools.r8.internal.bW:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction -> com.android.tools.r8.internal.wW:
     int numberOfFrames -> b
     1:2:void <init>(int):240:241 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonElement serialize():250:250 -> a
@@ -101744,13 +102450,13 @@
     509:509:com.android.tools.r8.com.google.gson.JsonElement serialize():250:250 -> a
     503:503:com.android.tools.r8.com.google.gson.JsonElement serialize():250:250 -> a
     510:510:void evaluate(com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder):265:265 -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction -> com.android.tools.r8.internal.cW:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RewriteAction -> com.android.tools.r8.internal.xW:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():203:203 -> <clinit>
     1:1:void <init>():203:203 -> <init>
     void evaluate(com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder) -> a
     com.android.tools.r8.com.google.gson.JsonElement serialize() -> a
-com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition -> com.android.tools.r8.internal.dW:
+com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition -> com.android.tools.r8.internal.yW:
     com.android.tools.r8.references.ClassReference classReference -> a
     1:2:void <init>(com.android.tools.r8.references.ClassReference):167:168 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonPrimitive serialize():173:173 -> a
@@ -101774,7 +102480,7 @@
     186:186:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition deserialize(java.lang.String):193 -> a
     187:187:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition deserialize(java.lang.String):193:193 -> a
     193:193:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$ThrowsCondition create(com.android.tools.r8.references.ClassReference):199:199 -> a
-com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation -> com.android.tools.r8.internal.v30:
+com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation -> com.android.tools.r8.internal.R30:
     java.lang.String id -> a
     java.lang.String payload -> b
     1:3:void <init>(java.lang.String,java.lang.String):16:18 -> <init>
@@ -101784,19 +102490,19 @@
     1:1:java.lang.String serialize():32:32 -> i
     1:1:java.lang.String getId():23:23 -> j
     1:1:java.lang.String getPayload():27:27 -> k
-com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Hm:
+com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Mm:
     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
-com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Hm$a:
+com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Mm$a:
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition MEMBER_ANNOTATION -> d
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition ENCLOSING_INNER_OR_TYPE_ANNOTATION -> c
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition CLASS_SUPER_OR_INTERFACE_ANNOTATION -> b
     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.Jm:
+com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.Om:
     com.android.tools.r8.naming.signature.GenericSignatureAction actions -> a
     char[] buffer -> e
     int pos -> f
@@ -101912,19 +102618,19 @@
     123:123:void parseMethodSignature(java.lang.String):103:103 -> c
     128:138:void scanSymbol():364:374 -> c
     1:17:void updateFormalTypeParameter():175:191 -> d
-com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.Km:
+com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.Pm:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.GenericSignatureContextBuilder contextBuilder -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GenericSignatureContextBuilder):33:35 -> <init>
     1:3:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):50:52 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.parseSignatureAttribute():689:689 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.parseSignatureAttribute():694:694 -> a
     4:4:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):52 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):60:60 -> a
-    6:6:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    6:6:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     6:6:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):60 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:boolean com.android.tools.r8.graph.AppView.hasLiveness():708:708 -> a
+    7:7:boolean com.android.tools.r8.graph.AppView.hasLiveness():720:720 -> a
     7:7:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):60 -> a
     8:17:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):60:69 -> a
     18:18:void run(java.lang.Iterable,java.util.concurrent.ExecutorService):66:66 -> a
@@ -101948,7 +102654,7 @@
     72:72:void lambda$run$4(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):101:101 -> a
     73:73:void lambda$run$4(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.GenericSignaturePartialTypeArgumentApplier,com.android.tools.r8.graph.DexEncodedMethod):100:100 -> a
     1:4:void runForD8(java.lang.Iterable,java.util.concurrent.ExecutorService):40:43 -> b
-com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.W9:
+com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.Z9:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -101964,7 +102670,7 @@
     2:2:java.lang.Boolean lambda$publicizeMethod$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass,java.lang.Boolean):181:181 -> a
     3:4: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:77 -> a
     5:9:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):82:86 -> a
-    10:10:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReachableInterface(java.util.function.Consumer):803:803 -> a
+    10:10:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReachableInterface(java.util.function.Consumer):766:766 -> a
     10:10:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):86 -> a
     11:14:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):87:90 -> a
     15:15:void lambda$run$0(com.android.tools.r8.graph.DexClass):86:86 -> a
@@ -101976,10 +102682,10 @@
     23:23:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
     23:23:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):107 -> a
     24:24:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):111:111 -> a
-    25:25:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> a
+    25:25:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> a
     25:25:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):111 -> a
     26:43:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):114:131 -> a
-    44:52:void com.android.tools.r8.graph.DexClass.replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):1086:1094 -> a
+    44:52:void com.android.tools.r8.graph.DexClass.replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):1100:1108 -> a
     44:52:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):129 -> a
     53:54:void lambda$publicizeClass$1(java.util.Set,com.android.tools.r8.graph.ProgramMethod):117:118 -> a
     55:55:void publicizeField(com.android.tools.r8.graph.ProgramField):136:136 -> a
@@ -102016,7 +102722,7 @@
     118:118:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):166 -> a
     119:119:void com.android.tools.r8.optimize.ClassAndMemberPublicizer.doPublicize(com.android.tools.r8.graph.ProgramDefinition):94:94 -> a
     119:119:boolean publicizeMethod(com.android.tools.r8.graph.ProgramMethod):166 -> a
-com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.Kk:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.Pk:
     boolean $assertionsDisabled -> g
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
     1:1:void <clinit>():23:23 -> <clinit>
@@ -102040,14 +102746,14 @@
     com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
     boolean hasCodeRewritings() -> e
     1:1:boolean isContextFreeForMethods():118:118 -> g
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Jk:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Ok:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> a
     1:1:void <init>(com.android.tools.r8.optimize.FieldRebindingIdentityLens$1):121:121 -> <init>
     2:2:void <init>():126:126 -> <init>
     3:3:void <init>():123:123 -> <init>
     1:1:void recordDefinitionForNonReboundFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):130:130 -> a
     2:3:com.android.tools.r8.optimize.FieldRebindingIdentityLens build(com.android.tools.r8.graph.DexItemFactory):137:138 -> a
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.lw:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.rw:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> e
     com.android.tools.r8.graph.DexMethod target -> f
     boolean $assertionsDisabled -> g
@@ -102080,7 +102786,7 @@
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):98 -> g
     2:2:com.android.tools.r8.graph.DexMethod getTarget():39:39 -> g
     3:3:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):53:53 -> g
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.KF:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.RF:
     com.android.tools.r8.optimize.MemberRebindingLens$Builder lensBuilder -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -102089,9 +102795,9 @@
     1:1:void <clinit>():47:47 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView):55:60 -> <init>
     1:1:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    1:1: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):177 -> a
-    2:10: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):178:186 -> a
-    11: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):182:189 -> a
+    1:1: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):179 -> a
+    2:10: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):180:188 -> a
+    11: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):184:191 -> a
     19:19:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.optimize.MemberRebindingAnalysis):47:47 -> a
     20:20:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):69:69 -> a
     21:21:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
@@ -102108,135 +102814,120 @@
     53:57:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):100:104 -> a
     58:58:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):103:103 -> a
     59:59:boolean com.android.tools.r8.graph.Definition.isLibraryMethod():0:0 -> a
-    59:59:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):147 -> a
+    59:59:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):149 -> a
     59:59:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):101 -> a
-    60:60:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):148:148 -> a
+    60:60:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):150:150 -> a
     60:60:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):101 -> a
-    61:61:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):168:168 -> a
-    61:61:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):149 -> a
+    61:61:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):170:170 -> a
+    61:61:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):151 -> a
     61:61:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):101 -> a
     62:62:boolean com.android.tools.r8.ir.code.Invoke$Type.isSuper():202:202 -> a
-    62:62:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):168 -> a
-    62:62:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):149 -> a
+    62:62:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):170 -> a
+    62:62:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):151 -> a
     62:62:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):101 -> a
-    63:63:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToAbstractMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):172:172 -> a
-    63:63:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):150 -> a
+    63:63:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToAbstractMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):174:174 -> a
+    63:63:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):152 -> a
     63:63:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):101 -> a
     64:64:boolean com.android.tools.r8.ir.code.Invoke$Type.isSuper():202:202 -> a
-    64:64:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToAbstractMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):172 -> a
-    64:64:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):150 -> a
+    64:64:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.isInvokeSuperToAbstractMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):174 -> a
+    64:64:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):152 -> a
     64:64:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):101 -> a
-    65:65:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):152:152 -> a
+    65:65:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):154:154 -> a
     65:65:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):101 -> a
-    66:66:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type):151:151 -> a
+    66:66:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.canRebindDirectlyToLibraryMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):153:153 -> a
     66:66:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):101 -> a
-    67:69:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):107:109 -> a
-    70:70:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):774:774 -> a
-    70:70:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):766 -> a
-    70:70:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):109 -> a
-    71:71:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexMethod):770:770 -> a
-    71:71:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeNoSideEffectsMethod(com.android.tools.r8.graph.DexClassAndMethod):774 -> a
-    71:71:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):766 -> a
-    71:71:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):109 -> a
-    72:72:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeValuesMethod(com.android.tools.r8.graph.DexClassAndMethod):782:782 -> a
-    72:72:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):766 -> a
-    72:72:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):109 -> a
-    73:73:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeValuesMethod(com.android.tools.r8.graph.DexMethod):778:778 -> a
-    73:73:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeValuesMethod(com.android.tools.r8.graph.DexClassAndMethod):782 -> a
-    73:73:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isAssumeMethod(com.android.tools.r8.graph.DexClassAndMethod):766 -> a
-    73:73:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):109 -> a
-    74:96:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):112:134 -> a
-    97:103:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):130:136 -> a
-    104:104:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):159:159 -> a
-    105:105:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():438:438 -> a
-    105:105:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):159 -> a
+    67:94:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):108:135 -> a
+    95:101:com.android.tools.r8.graph.DexMethod validMemberRebindingTargetForNonProgramMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):131:137 -> a
+    102:102:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):161:161 -> a
+    103:103:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():438:438 -> a
+    103:103:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):161 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    106:106:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():438:438 -> a
-    106:106:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):159 -> a
-    107:107:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):162:162 -> a
-    108:108:boolean lambda$isAccessibleInAllContexts$0(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):164:164 -> a
-    109:110:com.android.tools.r8.graph.DexType firstLibraryClassOrFirstInterfaceTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):199:200 -> a
-    111:116:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.MemberRebindingAnalysis.firstLibraryClass(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):238:243 -> a
-    111:116:com.android.tools.r8.graph.DexType firstLibraryClassOrFirstInterfaceTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):201 -> a
-    117:139: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):209:231 -> a
-    140:140:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod):255:255 -> a
-    141:141:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):261:261 -> a
-    142:146:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):260:264 -> a
-    147:153:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):263:269 -> a
-    154:158:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):268:272 -> a
-    159:159:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):271:271 -> a
-    160:232:void computeMethodRebinding(com.android.tools.r8.utils.BiForEachable,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):279:351 -> a
-    233:233:java.util.List lambda$computeMethodRebinding$1(com.android.tools.r8.graph.DexProgramClass):284:284 -> a
-    234:235:void lambda$computeMethodRebinding$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod):284:285 -> a
-    236:243:void lambda$computeMethodRebinding$4(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):289:296 -> a
-    244:247:void lambda$computeMethodRebinding$4(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):295:298 -> a
-    248:262:void lambda$computeMethodRebinding$4(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):297:311 -> a
-    263:263:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):373:373 -> a
-    263:263:void lambda$computeMethodRebinding$4(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):318 -> a
-    264:264:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    264:264:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):373 -> a
+    104:104:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():438:438 -> a
+    104:104:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):161 -> a
+    105:105:boolean isAccessibleInAllContexts(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.utils.collections.ProgramMethodSet):164:164 -> a
+    106:106:boolean lambda$isAccessibleInAllContexts$0(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):166:166 -> a
+    107:108:com.android.tools.r8.graph.DexType firstLibraryClassOrFirstInterfaceTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):201:202 -> a
+    109:114:com.android.tools.r8.graph.DexType com.android.tools.r8.optimize.MemberRebindingAnalysis.firstLibraryClass(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexType):240:245 -> a
+    109:114:com.android.tools.r8.graph.DexType firstLibraryClassOrFirstInterfaceTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.Object,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):203 -> a
+    115:137: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):211:233 -> a
+    138:138:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod):257:257 -> a
+    139:139:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):263:263 -> a
+    140:144:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):262:266 -> a
+    145:151:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):265:271 -> a
+    152:156:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):270:274 -> a
+    157:157:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):273:273 -> a
+    158:230:void computeMethodRebinding(com.android.tools.r8.utils.BiForEachable,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):281:353 -> a
+    231:231:java.util.List lambda$computeMethodRebinding$1(com.android.tools.r8.graph.DexProgramClass):286:286 -> a
+    232:233:void lambda$computeMethodRebinding$2(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod):286:287 -> a
+    234:241:void lambda$computeMethodRebinding$4(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):291:298 -> a
+    242:245:void lambda$computeMethodRebinding$4(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):297:300 -> a
+    246:260:void lambda$computeMethodRebinding$4(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):299:313 -> a
+    261:261:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):375:375 -> a
+    261:261:void lambda$computeMethodRebinding$4(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):320 -> a
+    262:262:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    262:262:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):375 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    264:264:void lambda$computeMethodRebinding$4(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):318 -> a
-    265:265:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    265:265:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):373 -> a
-    265:265:void lambda$computeMethodRebinding$4(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):318 -> a
-    266:269:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):373:376 -> a
-    266:269:void lambda$computeMethodRebinding$4(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):318 -> a
-    270:270:void lambda$computeMethodRebinding$4(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):322:322 -> a
-    271:275:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.TriConsumer):393:397 -> a
-    271:275:void lambda$computeMethodRebinding$4(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):321 -> a
-    276:277:void lambda$computeMethodRebinding$4(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):326:327 -> a
-    278:287:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):440:449 -> a
-    278:287:void lambda$computeMethodRebinding$4(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):329 -> a
-    288:291:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):444:447 -> a
-    288:291:void lambda$computeMethodRebinding$4(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):329 -> a
-    292:292:void lambda$computeMethodRebinding$4(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):335:335 -> a
-    293:293:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    293:293:void lambda$computeMethodRebinding$4(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):336 -> a
-    294:300:void lambda$computeMethodRebinding$4(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):337:343 -> a
-    301:301:void lambda$computeMethodRebinding$4(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):341:341 -> a
-    302:302:void lambda$computeMethodRebinding$4(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):339:339 -> a
-    303:303:int lambda$computeMethodRebinding$5(com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.Pair):355:355 -> a
-    304:315:void lambda$computeMethodRebinding$6(java.util.function.Function,com.android.tools.r8.graph.DexProgramClass,java.util.List):355:366 -> a
-    316:325:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):401:410 -> a
-    326:333:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):414:421 -> a
-    326:333:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):327 -> a
-    334:338:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):420:424 -> a
-    334:338:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):327 -> a
-    339:343:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):423:427 -> a
-    339:343:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):327 -> a
-    344:366:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):454:476 -> a
-    367:368:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$8(java.util.Set,com.android.tools.r8.graph.FieldAccessInfo):504:505 -> a
-    369:374:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):507:512 -> a
-    375:380:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):508:513 -> a
-    381:383:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):522:524 -> a
-    384:384:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):523:523 -> a
-    385:386:void lambda$computeNonReboundFieldReferences$9(java.util.Set,com.android.tools.r8.graph.ProgramMethod):526:527 -> a
-    1:1:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod):247:247 -> b
-    2:5:void recordNonReboundFieldAccesses(java.util.concurrent.ExecutorService):483:486 -> b
-    1:1:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):251:251 -> c
-    2:6:com.android.tools.r8.optimize.MemberRebindingLens run(java.util.concurrent.ExecutorService):490:494 -> c
-    1:18:boolean verifyFieldAccessCollectionContainsAllNonReboundFieldReferences(java.util.concurrent.ExecutorService):499:516 -> d
-com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.JF:
+    262:262:void lambda$computeMethodRebinding$4(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):320 -> a
+    263:263:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    263:263:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):375 -> a
+    263:263:void lambda$computeMethodRebinding$4(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):320 -> a
+    264:267:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):375:378 -> a
+    264:267:void lambda$computeMethodRebinding$4(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):320 -> a
+    268:268:void lambda$computeMethodRebinding$4(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):324:324 -> a
+    269:273:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForInterfaceMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.TriConsumer):395:399 -> a
+    269:273:void lambda$computeMethodRebinding$4(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):323 -> a
+    274:275:void lambda$computeMethodRebinding$4(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):328:329 -> a
+    276:285:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):442:451 -> a
+    276:285:void lambda$computeMethodRebinding$4(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):331 -> a
+    286:289:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.MemberRebindingAnalysis.insertBridgeForVisibilityIfNeeded(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.TriConsumer):446:449 -> a
+    286:289:void lambda$computeMethodRebinding$4(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):331 -> a
+    290:290:void lambda$computeMethodRebinding$4(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):337:337 -> a
+    291:291:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    291:291:void lambda$computeMethodRebinding$4(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):338 -> a
+    292:298:void lambda$computeMethodRebinding$4(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):339:345 -> a
+    299:299:void lambda$computeMethodRebinding$4(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):343:343 -> a
+    300:300:void lambda$computeMethodRebinding$4(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):341:341 -> a
+    301:301:int lambda$computeMethodRebinding$5(com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.Pair):357:357 -> a
+    302:313:void lambda$computeMethodRebinding$6(java.util.function.Function,com.android.tools.r8.graph.DexProgramClass,java.util.List):357:368 -> a
+    314:323:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):403:412 -> a
+    324:331:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):416:423 -> a
+    324:331:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):329 -> a
+    332:336:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):422:426 -> a
+    332:336:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):329 -> a
+    337:341:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClassAndMethod):425:429 -> a
+    337:341:boolean lambda$computeMethodRebinding$3(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.ProgramMethod):329 -> a
+    342:364:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):456:478 -> a
+    365:366:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$8(java.util.Set,com.android.tools.r8.graph.FieldAccessInfo):506:507 -> a
+    367:372:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):509:514 -> a
+    373:378:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexField):510:515 -> a
+    379:381:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):524:526 -> a
+    382:382:java.util.Set computeNonReboundFieldReferences(java.util.concurrent.ExecutorService):525:525 -> a
+    383:384:void lambda$computeNonReboundFieldReferences$9(java.util.Set,com.android.tools.r8.graph.ProgramMethod):528:529 -> a
+    1:1:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod):249:249 -> b
+    2:5:void recordNonReboundFieldAccesses(java.util.concurrent.ExecutorService):485:488 -> b
+    1:1:com.android.tools.r8.graph.MethodResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexMethod):253:253 -> c
+    2:6:com.android.tools.r8.optimize.MemberRebindingLens run(java.util.concurrent.ExecutorService):492:496 -> c
+    1:18:boolean verifyFieldAccessCollectionContainsAllNonReboundFieldReferences(java.util.concurrent.ExecutorService):501:518 -> d
+com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.QF:
     com.android.tools.r8.optimize.MemberRebindingAnalysis this$0 -> f
     java.util.Set val$nonReboundFieldReferences -> e
-    1:1:void <init>(com.android.tools.r8.optimize.MemberRebindingAnalysis,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.Set):528:528 -> <init>
+    1:1:void <init>(com.android.tools.r8.optimize.MemberRebindingAnalysis,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.Set):530:530 -> <init>
     void registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
-    1:1:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):532:532 -> a
-    2:3:void lambda$registerFieldReference$0(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):556:557 -> a
+    1:1:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):534:534 -> a
+    2:3:void lambda$registerFieldReference$0(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):558:559 -> a
     void registerInitClass(com.android.tools.r8.graph.DexType) -> b
     void registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
     void registerInstanceOf(com.android.tools.r8.graph.DexType) -> c
-    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):537:537 -> c
+    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):539:539 -> c
     void registerInvokeStatic(com.android.tools.r8.graph.DexMethod) -> d
     void registerNewInstance(com.android.tools.r8.graph.DexType) -> d
-    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):542:542 -> e
+    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):544:544 -> e
     void registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> f
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):547:547 -> g
-    1:4:void registerFieldReference(com.android.tools.r8.graph.DexField):551:554 -> i
-com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.MF:
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):549:549 -> g
+    1:4:void registerFieldReference(com.android.tools.r8.graph.DexField):553:556 -> i
+com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.TF:
     boolean $assertionsDisabled -> h
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> f
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> g
@@ -102283,7 +102974,7 @@
     com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
     boolean hasCodeRewritings() -> e
     1:1:boolean isContextFreeForMethods():141:141 -> g
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.LF:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.SF:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> d
@@ -102309,7 +103000,7 @@
     18:18:void com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder.recordNonReboundMethodAccess(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):208:208 -> a
     18:18:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):221 -> a
     19:22:com.android.tools.r8.optimize.MemberRebindingIdentityLens build():231:234 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.OF:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.VF:
     1:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):46:64 -> 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):71:71 -> 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
@@ -102323,7 +103014,7 @@
     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):92:92 -> a
     32:32:void com.android.tools.r8.graph.UseRegistry.accept(com.android.tools.r8.graph.ProgramMethod):31:31 -> a
     32:32: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):99 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.NF:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.UF:
     java.util.Set seenFieldReferences -> h
     java.util.Set seenMethodReferences -> i
     com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder methodAccessInfoCollectionBuilder -> g
@@ -102357,7 +103048,7 @@
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):143:143 -> g
     2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):204:204 -> g
     1:6:void registerFieldAccess(com.android.tools.r8.graph.DexField):147:152 -> i
-com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.QF:
+com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.XF:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.AppView appView -> f
     java.util.Map methodMaps -> g
@@ -102396,7 +103087,7 @@
     1:3:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):89:91 -> d
     com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> e
     1:1:boolean isContextFreeForMethods():96:96 -> g
-com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.PF:
+com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.WF:
     java.util.Map methodMaps -> b
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -102411,7 +103102,7 @@
     11:11:void com.android.tools.r8.optimize.MemberRebindingLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):194:194 -> a
     11:11:void lambda$recordNonReboundFieldAccesses$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):189 -> a
     12:12:com.android.tools.r8.optimize.MemberRebindingLens build():198:198 -> a
-com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.bS:
+com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.uS:
     com.android.tools.r8.graph.AppView appView -> n
     boolean $assertionsDisabled -> p
     java.util.Set publicizedMethods -> o
@@ -102440,14 +103131,14 @@
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
     boolean isLegitimateToHaveEmptyMappings() -> m
     1:1:com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder createBuilder():65:65 -> n
-com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.aS:
+com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.tS:
     java.util.Set publicizedMethods -> a
     1:1:void <init>(com.android.tools.r8.optimize.PublicizerLens$1):68:68 -> <init>
     2:2:void <init>():71:71 -> <init>
     3:3:void <init>():69:69 -> <init>
     1:4:com.android.tools.r8.graph.GraphLens build(com.android.tools.r8.graph.AppView):74:77 -> a
     5:5:void add(com.android.tools.r8.graph.DexMethod):81:81 -> a
-com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.d50:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.z50:
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -102498,20 +103189,20 @@
     72:89:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):147:164 -> a
     90:92:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.function.BiConsumer,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):217:219 -> a
     90:92:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):164 -> a
-    93:93:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    93:93:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     93:93:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.function.BiConsumer,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):219 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     93:93:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):164 -> a
-    94:94:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    94:94:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     94:94:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.function.BiConsumer,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):219 -> a
     94:94:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):164 -> a
     95:115:void com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagator.populateParameterOptimizationInfo(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.List,java.util.function.BiConsumer,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):219:239 -> a
     95:115:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):164 -> a
     116:136:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):180:200 -> a
-    137:137:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    137:137:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     137:137:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):200 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    138:138:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    138:138:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     138:138:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):200 -> a
     139:139:void tearDownCodeScanner(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):200:200 -> a
     140:143:void lambda$tearDownCodeScanner$2(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexMethodSignature):169:172 -> a
@@ -102621,7 +103312,7 @@
     113:113:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computePolymorphicMethodState(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom):285:285 -> a
     113:113:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):258 -> a
     113:113:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):236 -> a
-    114:114:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    114:114:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> a
     114:114:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computePolymorphicMethodState(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom):285 -> a
     114:114:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):258 -> a
     114:114:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):236 -> a
@@ -102708,7 +103399,7 @@
     171:171:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):367:367 -> a
     171:171:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):266 -> a
     171:171:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):236 -> a
-    172:172:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    172:172:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> a
     172:172:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom):367 -> a
     172:172:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.utils.Timing):266 -> a
     172:172:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState lambda$scan$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):236 -> a
@@ -102765,10 +103456,10 @@
     226:226:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):400 -> a
     227:227:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):457:457 -> a
     227:227:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):400 -> a
-    228:228:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    228:228:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     228:228:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):457 -> a
     228:228:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):400 -> a
-    229:229:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):223:223 -> a
+    229:229:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):224:224 -> a
     229:229:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):457 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     229:229:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):400 -> a
@@ -102839,7 +103530,7 @@
     281:281:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):400 -> a
     282:287:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):492:497 -> a
     282:287:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):400 -> a
-    288:288:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    288:288:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> a
     288:288:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):497 -> a
     288:288:com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown computeMonomorphicMethodState(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.ir.analysis.type.DynamicType):400 -> a
     289:291:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorCodeScanner.computeParameterStateForNonReceiver(com.android.tools.r8.ir.code.InvokeMethod,int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom,com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria):498:500 -> a
@@ -102939,7 +103630,7 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():27:27 -> <clinit>
     1:24:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):40:63 -> a
-    25:25:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):43:43 -> a
+    25:25:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.analysis.value.SingleValue.createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):41:41 -> a
     25:25:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):65 -> a
     26:59:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo):66:99 -> a
     60:60: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
@@ -102966,10 +103657,10 @@
     1:19:void enqueueMethodForReprocessing(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):55:73 -> a
     20:22:void enqueueAffectedCallees(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder):79:81 -> a
     23:33:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):84:94 -> a
-    34:34:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    34:34:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     34:34:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):94 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    35:35:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    35:35:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     35:35:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):94 -> a
     36:45:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):94:103 -> a
     46:46:boolean com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria.shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo) -> a
@@ -102980,10 +103671,10 @@
     48:58:boolean com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria.shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):50:60 -> a
     48:58:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):103 -> a
     59:62:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):103:106 -> a
-    63:63:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    63:63:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     63:63:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):106 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    64:64:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    64:64:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     64:64:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):106 -> a
     65:65:void lambda$enqueueAffectedCallees$0(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):106:106 -> a
     66:69:void enqueueAffectedCallers(com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService):120:123 -> a
@@ -103237,9 +103928,9 @@
     151:151:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):381 -> a
     152:166:void lambda$computePrototypeChangesForVirtualMethods$6(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.utils.collections.ProgramMethodSet):383:397 -> a
     167:169:java.util.Map computeVirtualMethodsBySignature(java.util.Set):406:408 -> a
-    170:170:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> a
+    170:170:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> a
     170:170:java.util.Map computeVirtualMethodsBySignature(java.util.Set):408 -> a
-    171:171:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> a
+    171:171:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> a
     171:171:java.util.Map computeVirtualMethodsBySignature(java.util.Set):408 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     172:172:void lambda$computeVirtualMethodsBySignature$7(java.util.Map,com.android.tools.r8.graph.ProgramMethod):412:412 -> a
@@ -103256,7 +103947,7 @@
     181:183:boolean com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorProgramOptimizer$StronglyConnectedComponentOptimizer.isPrototypeChangesAllowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.collections.DexMethodSignatureSet):421:423 -> a
     181:183:boolean lambda$computePrototypeChangesForVirtualMethods$5(com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):351 -> a
     184:211:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):572:599 -> a
-    212:212:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):292:292 -> a
+    212:212:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):296:296 -> a
     212:212:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):599 -> a
     213:244:boolean visitClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.optimize.argumentpropagation.ArgumentPropagatorGraphLens$Builder):609:640 -> a
     245:245:boolean lambda$visitClass$11(com.android.tools.r8.graph.DexEncodedField):587:587 -> a
@@ -103440,13 +104131,13 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     12:14:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):44 -> b
     15:16:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):45:46 -> b
-    17:17:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> b
+    17:17:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> b
     17:17:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):46 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    18:18:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> b
+    18:18:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> b
     18:18:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):46 -> b
     19:22:boolean lambda$initializeUnoptimizableMethodStates$0(com.android.tools.r8.graph.ProgramMethod):47:50 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState -> com.android.tools.r8.internal.P5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState -> com.android.tools.r8.internal.R5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -103462,7 +104153,7 @@
     13:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):45 -> a
     14:15:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):47:48 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomArrayTypeParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState -> com.android.tools.r8.internal.R5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState -> com.android.tools.r8.internal.T5:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState INSTANCE -> a
     1:3:void <clinit>():15:17 -> <clinit>
@@ -103478,7 +104169,7 @@
     16:16:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):50 -> a
     17:18:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):51:52 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomClassTypeParameterState get():22:22 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState -> com.android.tools.r8.internal.T5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState -> com.android.tools.r8.internal.V5:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -103490,14 +104181,14 @@
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom() -> h
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom() -> i
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomMethodState get():20:20 -> k
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomParameterState -> com.android.tools.r8.internal.U5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomParameterState -> com.android.tools.r8.internal.W5:
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):17:17 -> a
     2:2:com.android.tools.r8.ir.analysis.value.BottomValue com.android.tools.r8.ir.analysis.value.AbstractValue.bottom():16:16 -> a
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):17 -> a
     boolean isBottom() -> c
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy() -> f
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState -> com.android.tools.r8.internal.Y5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState -> com.android.tools.r8.internal.a6:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():12:14 -> <clinit>
@@ -103510,7 +104201,7 @@
     6:6:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):38 -> a
     7:8:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):38:39 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomPrimitiveTypeParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState -> com.android.tools.r8.internal.Z5:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState -> com.android.tools.r8.internal.b6:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -103526,7 +104217,7 @@
     13:13:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):45 -> a
     14:15:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner,com.android.tools.r8.utils.Action):47:48 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.BottomReceiverParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState -> com.android.tools.r8.internal.hd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteArrayTypeParameterState -> com.android.tools.r8.internal.kd:
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
@@ -103560,7 +104251,7 @@
     1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():70:70 -> r
     1:1:boolean isEffectivelyBottom():84:84 -> s
     1:1:boolean isEffectivelyUnknown():88:88 -> t
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState -> com.android.tools.r8.internal.ld:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteClassTypeParameterState -> com.android.tools.r8.internal.od:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> d
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> c
@@ -103599,7 +104290,7 @@
     2:2:boolean isEffectivelyBottom():89 -> s
     3:3:boolean isEffectivelyBottom():89:89 -> s
     1:1:boolean isEffectivelyUnknown():93:93 -> t
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState -> com.android.tools.r8.internal.nd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState -> com.android.tools.r8.internal.qd:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -103632,7 +104323,7 @@
     22:22:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner):45:45 -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMethodState asConcrete() -> d
     boolean isConcrete() -> e
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState -> com.android.tools.r8.internal.od:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState -> com.android.tools.r8.internal.rd:
     java.util.List parameterStates -> c
     boolean isReturnValueUsed -> b
     boolean $assertionsDisabled -> d
@@ -103747,10 +104438,10 @@
     1:1:boolean isEffectivelyUnknown():55:55 -> m
     1:1:boolean isReturnValueUsed():47:47 -> n
     1:1:int size():134:134 -> o
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.pd:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.qd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom -> com.android.tools.r8.internal.sd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown -> com.android.tools.r8.internal.td:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown mutableCopy() -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState -> com.android.tools.r8.internal.sd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState -> com.android.tools.r8.internal.vd:
     java.util.Set inParameters -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():15:15 -> <clinit>
@@ -103775,7 +104466,7 @@
     1:1:boolean hasInParameters():45:45 -> n
     1:1:void internalClearInParameters():33:33 -> o
     boolean isReferenceParameter() -> p
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState -> com.android.tools.r8.internal.td:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState -> com.android.tools.r8.internal.wd:
     java.util.Map receiverBoundsToState -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():19:19 -> <clinit>
@@ -103907,9 +104598,9 @@
     1:1:boolean isEffectivelyBottom():113:113 -> k
     1:1:boolean isEffectivelyUnknown():117:117 -> l
     1:1:java.util.Collection values():183:183 -> m
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.ud:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown -> com.android.tools.r8.internal.vd:
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState -> com.android.tools.r8.internal.xd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom -> com.android.tools.r8.internal.xd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrUnknown -> com.android.tools.r8.internal.yd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePrimitiveTypeParameterState -> com.android.tools.r8.internal.Ad:
     com.android.tools.r8.ir.analysis.value.AbstractValue abstractValue -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():16:16 -> <clinit>
@@ -103936,7 +104627,7 @@
     2:2:boolean isEffectivelyBottom():92 -> q
     3:3:boolean isEffectivelyBottom():92:92 -> q
     1:1:boolean isEffectivelyUnknown():96:96 -> r
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverParameterState -> com.android.tools.r8.internal.yd:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReceiverParameterState -> com.android.tools.r8.internal.Bd:
     com.android.tools.r8.ir.analysis.type.DynamicType dynamicType -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():17:17 -> <clinit>
@@ -103962,14 +104653,14 @@
     2:2:com.android.tools.r8.ir.analysis.type.Nullability getNullability():57:57 -> r
     1:1:boolean isEffectivelyBottom():66:66 -> s
     1:1:boolean isEffectivelyUnknown():70:70 -> t
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState -> com.android.tools.r8.internal.Ad:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState -> com.android.tools.r8.internal.Dd:
     1:1:void <init>(java.util.Set):18:18 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Action) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteReferenceTypeParameterState asReferenceParameter() -> j
     boolean isReferenceParameter() -> p
     com.android.tools.r8.ir.analysis.type.DynamicType getDynamicType() -> q
     com.android.tools.r8.ir.analysis.type.Nullability getNullability() -> r
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter -> com.android.tools.r8.internal.CG:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter -> com.android.tools.r8.internal.JG:
     int index -> b
     com.android.tools.r8.graph.DexMethod method -> a
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,int):15:17 -> <init>
@@ -103988,11 +104679,11 @@
     93:93:java.lang.String toString():44:44 -> toString
     94:94:java.lang.String toString():44:44 -> toString
     95:95:java.lang.String toString():44:44 -> toString
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory -> com.android.tools.r8.internal.DG:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameterFactory -> com.android.tools.r8.internal.KG:
     java.util.Map methodParameters -> a
     1:3:void <init>():12:14 -> <init>
     1:3:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter create(com.android.tools.r8.graph.ProgramMethod,int):17:17 -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com.android.tools.r8.internal.KG:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState -> com.android.tools.r8.internal.RG:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy() -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> a
@@ -104005,7 +104696,7 @@
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom() -> h
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom() -> i
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState asPolymorphic() -> j
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase -> com.android.tools.r8.internal.LG:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateBase -> com.android.tools.r8.internal.SG:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState asMonomorphic() -> b
     boolean isPolymorphic() -> c
@@ -104016,7 +104707,7 @@
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrBottom asMonomorphicOrBottom() -> h
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodStateOrBottom asPolymorphicOrBottom() -> i
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcretePolymorphicMethodState asPolymorphic() -> j
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection -> com.android.tools.r8.internal.MG:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection -> com.android.tools.r8.internal.TG:
     java.util.Map methodStates -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():17:17 -> <clinit>
@@ -104044,7 +104735,7 @@
     2:2:void set(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):117:117 -> b
     3:6:void com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.set(java.lang.Object,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):121:124 -> b
     3:6:void set(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):117 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference -> com.android.tools.r8.internal.NG:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference -> com.android.tools.r8.internal.UG:
     1:1:void <init>(java.util.Map):17:17 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState get(java.lang.Object):14:14 -> a
     2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference.getKey(com.android.tools.r8.graph.ProgramMethod):30:30 -> a
@@ -104059,7 +104750,7 @@
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState get(com.android.tools.r8.graph.ProgramMethod):14 -> b
     5:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.get(com.android.tools.r8.graph.ProgramMethod):96:96 -> b
     5:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState get(com.android.tools.r8.graph.ProgramMethod):14 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature -> com.android.tools.r8.internal.OG:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature -> com.android.tools.r8.internal.VG:
     1:1:void <init>(java.util.Map):16:16 -> <init>
     1:1:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature.getKey(com.android.tools.r8.graph.ProgramMethod):29:29 -> a
     1:1:java.lang.Object getKey(com.android.tools.r8.graph.ProgramMethod):13 -> a
@@ -104072,10 +104763,10 @@
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature.get(java.lang.Object):13:13 -> b
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollection.get(com.android.tools.r8.graph.ProgramMethod):96 -> b
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState get(com.android.tools.r8.graph.ProgramMethod):13 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyParameterState -> com.android.tools.r8.internal.sJ:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyParameterState -> com.android.tools.r8.internal.zJ:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.NonEmptyParameterState asNonEmpty() -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState -> com.android.tools.r8.internal.HN:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState -> com.android.tools.r8.internal.YN:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteParameterState asConcrete() -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView) -> a
@@ -104085,7 +104776,7 @@
     boolean isConcrete() -> d
     boolean isUnknown() -> e
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy() -> f
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner -> com.android.tools.r8.internal.IY:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner -> com.android.tools.r8.internal.dZ:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner CLONER -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner IDENTITY -> b
     1:14:void <clinit>():23:36 -> <clinit>
@@ -104094,15 +104785,15 @@
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState) -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner getCloner():50:50 -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner getIdentity():54:54 -> b
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$1 -> com.android.tools.r8.internal.GY:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$1 -> com.android.tools.r8.internal.bZ:
     1:1:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState):27:27 -> a
     2:2:com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState):32:32 -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$2 -> com.android.tools.r8.internal.HY:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner$2 -> com.android.tools.r8.internal.cZ:
     1:1:void <init>():37:37 -> <init>
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy(com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState) -> a
-com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState -> com.android.tools.r8.internal.w30:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState -> com.android.tools.r8.internal.S30:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -104111,7 +104802,7 @@
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodState mutableJoin(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethodSignature,java.util.function.Function,com.android.tools.r8.optimize.argumentpropagation.codescanner.StateCloner) -> a
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownMethodState get():21:21 -> k
-com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState -> com.android.tools.r8.internal.x30:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState -> com.android.tools.r8.internal.T30:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -104121,7 +104812,7 @@
     2:2:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView):25 -> a
     com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState mutableCopy() -> f
     1:1:com.android.tools.r8.optimize.argumentpropagation.codescanner.UnknownParameterState get():20:20 -> g
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis -> com.android.tools.r8.internal.Z40:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis -> com.android.tools.r8.internal.v50:
     java.util.Set monomorphicVirtualMethods -> g
     java.util.Map virtualRootMethodsPerClass -> f
     java.util.Map virtualRootMethods -> h
@@ -104131,11 +104822,11 @@
     6:7:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):130:131 -> a
     8:8:void com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis.promoteToFinalIfPossible(com.android.tools.r8.graph.DexProgramClass):211:211 -> a
     8:8:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):132 -> a
-    9:9:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    9:9:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     9:9:void com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis.promoteToFinalIfPossible(com.android.tools.r8.graph.DexProgramClass):211 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):132 -> a
-    10:10:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    10:10:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     10:10:void com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis.promoteToFinalIfPossible(com.android.tools.r8.graph.DexProgramClass):211 -> a
     10:10:void forEachSubClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):132 -> a
     11:15:void com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis.promoteToFinalIfPossible(com.android.tools.r8.graph.DexProgramClass):211:215 -> a
@@ -104151,17 +104842,17 @@
     31:56:void lambda$prune$6(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):177:202 -> a
     57:59:void lambda$prune$4(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):195:195 -> a
     60:60:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod):220:220 -> a
-    61:61:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    61:61:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     61:61:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod):220 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    62:62:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():539:539 -> a
+    62:62:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():551:551 -> a
     62:62:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod):220 -> a
     63:68:void promoteToFinalIfPossible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod):220:225 -> a
     1:1:void lambda$prune$5(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):204:204 -> b
     1:3:void prune(com.android.tools.r8.graph.DexProgramClass):172:174 -> i
-    4:4:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> i
+    4:4:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> i
     4:4:void prune(com.android.tools.r8.graph.DexProgramClass):174 -> i
-    5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> i
+    5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> i
     5:5:void prune(com.android.tools.r8.graph.DexProgramClass):174 -> i
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:2:void visit(com.android.tools.r8.graph.DexProgramClass):140:141 -> k
@@ -104172,9 +104863,9 @@
     4:4:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):147 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):157:157 -> l
-    6:6:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> l
+    6:6:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> l
     6:6:java.util.Map computeVirtualRootMethodsState(com.android.tools.r8.graph.DexProgramClass):157 -> l
-com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod -> com.android.tools.r8.internal.Y40:
+com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod -> com.android.tools.r8.internal.u50:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.VirtualRootMethodsAnalysis$VirtualRootMethod parent -> a
     com.android.tools.r8.utils.collections.ProgramMethodSet overrides -> c
     com.android.tools.r8.graph.ProgramMethod root -> b
@@ -104193,7 +104884,7 @@
     13:13:com.android.tools.r8.graph.ProgramMethod getSingleNonAbstractMethod():84:84 -> c
     1:1:boolean hasOverrides():95:95 -> d
     1:1:boolean isInterfaceMethodWithSiblings():101:101 -> e
-com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter -> com.android.tools.r8.internal.JJ:
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter -> com.android.tools.r8.internal.QJ:
     1:1:void <init>():32:32 -> <init>
     void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult) -> a
     void processWorklist() -> a
@@ -104204,11 +104895,11 @@
     7:7:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):40:40 -> a
     8:8:boolean com.android.tools.r8.graph.GraphLens.isArgumentPropagatorGraphLens():0:0 -> a
     8:8:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):40 -> a
-com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$EmptyNullCheckInserter -> com.android.tools.r8.internal.HJ:
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$EmptyNullCheckInserter -> com.android.tools.r8.internal.OJ:
     1:1:void <init>():208:208 -> <init>
     void insertNullCheckForInvokeReceiverIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult) -> a
     void processWorklist() -> a
-com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl -> com.android.tools.r8.internal.IJ:
+com.android.tools.r8.optimize.argumentpropagation.lenscoderewriter.NullCheckInserter$NullCheckInserterImpl -> com.android.tools.r8.internal.PJ:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Map worklist -> d
     boolean $assertionsDisabled -> e
@@ -104245,7 +104936,7 @@
     106:106:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlockIterator.previousUntil(java.util.function.Predicate):68:68 -> a
     106:106:void processWorklist():159 -> a
     107:113:void processWorklist():160:166 -> a
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator -> com.android.tools.r8.internal.Mp:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator -> com.android.tools.r8.internal.Rp:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.conversion.IRConverter converter -> b
@@ -104273,7 +104964,7 @@
     26:26:boolean com.android.tools.r8.optimize.argumentpropagation.codescanner.ParameterState.isUnknown():0:0 -> b
     26:26:void propagate(com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode,java.util.function.Consumer):112 -> b
     27:31:void propagate(com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode,java.util.function.Consumer):113:117 -> b
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$FlowGraph -> com.android.tools.r8.internal.Kp:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$FlowGraph -> com.android.tools.r8.internal.Pp:
     java.util.Map nodes -> a
     com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator this$0 -> b
     boolean $assertionsDisabled -> c
@@ -104348,7 +105039,7 @@
     76:79:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode getOrCreateParameterNode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):249:252 -> a
     80:80:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode getOrCreateParameterNode(com.android.tools.r8.graph.ProgramMethod,int,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState):251:251 -> a
     81:82:com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode lambda$getOrCreateParameterNode$1(com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodState,int,com.android.tools.r8.graph.ProgramMethod,java.lang.Integer,com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode):256:257 -> a
-com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode -> com.android.tools.r8.internal.Lp:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InParameterFlowPropagator$ParameterNode -> com.android.tools.r8.internal.Qp:
     java.util.Set predecessors -> d
     java.util.Set successors -> e
     com.android.tools.r8.graph.DexType parameterType -> c
@@ -104374,7 +105065,7 @@
     2:2:void setPending():346 -> g
     3:4:void setPending():346:347 -> g
     1:2:void unsetPending():355:356 -> h
-com.android.tools.r8.optimize.argumentpropagation.propagation.InterfaceMethodArgumentPropagator -> com.android.tools.r8.internal.ev:
+com.android.tools.r8.optimize.argumentpropagation.propagation.InterfaceMethodArgumentPropagator -> com.android.tools.r8.internal.kv:
     boolean $assertionsDisabled -> i
     java.util.function.Consumer interfaceDispatchOutsideProgram -> h
     java.util.Map methodStatesToPropagate -> g
@@ -104423,14 +105114,14 @@
     4:4:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):94 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):104:104 -> l
-    6:6:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> l
+    6:6:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> l
     6:6:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):104 -> l
     7:7:com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionBySignature computeInterfaceState(com.android.tools.r8.graph.DexProgramClass):119:119 -> l
     1:1:boolean lambda$propagateInterfaceStateToClassHierarchy$2(com.android.tools.r8.graph.DexProgramClass):129:129 -> m
-com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.kG:
+com.android.tools.r8.optimize.argumentpropagation.propagation.MethodArgumentPropagator -> com.android.tools.r8.internal.rG:
     com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference methodStates -> f
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodStateCollectionByReference):21:22 -> <init>
-com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator -> com.android.tools.r8.internal.J40:
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator -> com.android.tools.r8.internal.f50:
     boolean $assertionsDisabled -> h
     java.util.Map propagationStates -> g
     1:1:void <clinit>():34:34 -> <clinit>
@@ -104455,9 +105146,9 @@
     57:64:void lambda$computePropagationState$0(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown):255:262 -> a
     65:67:void lambda$computePropagationState$0(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound,com.android.tools.r8.optimize.argumentpropagation.codescanner.ConcreteMonomorphicMethodStateOrUnknown):261:263 -> a
     68:68:void computeFinalMethodStates(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):290:290 -> a
-    69:69:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> a
+    69:69:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> a
     69:69:void computeFinalMethodStates(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):290 -> a
-    70:70:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> a
+    70:70:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> a
     70:70:void computeFinalMethodStates(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):290 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     71:72:void com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator.computeFinalMethodState(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState):294:295 -> a
@@ -104540,13 +105231,13 @@
     2:3:void visit(com.android.tools.r8.graph.DexProgramClass):201:202 -> k
     1:1:com.android.tools.r8.graph.AppView access$900(com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator):34:34 -> l
     2:5:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):206:209 -> l
-    6:6:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> l
+    6:6:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> l
     6:6:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):209 -> l
-    7:7:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> l
+    7:7:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> l
     7:7:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):209 -> l
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:void computePropagationState(com.android.tools.r8.graph.DexProgramClass):269:269 -> l
-com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.I40:
+com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator$PropagationState -> com.android.tools.r8.internal.e50:
     java.util.Map activeUntilLowerBound -> b
     java.util.Map inactiveUntilUpperBound -> c
     com.android.tools.r8.optimize.argumentpropagation.propagation.VirtualDispatchMethodArgumentPropagator this$0 -> d
@@ -104603,10 +105294,10 @@
     13:13:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):71 -> a
     14:18:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection.analyzeArgumentUses(com.android.tools.r8.ir.code.Argument):96:100 -> a
     14:18:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):71 -> a
-    19:19:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    19:19:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
     19:19:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection.analyzeArgumentUses(com.android.tools.r8.ir.code.Argument):100 -> a
     19:19:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):71 -> a
-    20:20:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():362:362 -> a
+    20:20:java.util.Set com.android.tools.r8.ir.code.Value.aliasedUsers():363:363 -> a
     20:20:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ArgumentPropagatorReprocessingCriteriaCollection.analyzeArgumentUses(com.android.tools.r8.ir.code.Argument):100 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:20:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):71 -> a
@@ -104620,7 +105311,7 @@
     102:114:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):70:82 -> a
     115:115:void analyzeArgumentUses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):81:81 -> a
     1:1:boolean verifyNoDelayedReprocessingCriteria():156:156 -> b
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria -> com.android.tools.r8.internal.IG:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria -> com.android.tools.r8.internal.PG:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap reproccesingCriteria -> a
     com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.MethodReprocessingCriteria ALWAYS_REPROCESS -> b
     boolean $assertionsDisabled -> c
@@ -104628,7 +105319,7 @@
     1:2:void <init>():23:24 -> <init>
     3:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):28:30 -> <init>
     1:3:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria getParameterReprocessingCriteria(int):38:38 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.AJ:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria -> com.android.tools.r8.internal.HJ:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:2:void <init>(boolean):26:27 -> <init>
@@ -104650,11 +105341,11 @@
     19:19:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):41:41 -> a
     20:20:boolean com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.NonTrivialParameterReprocessingCriteria.shouldReprocessPrimitiveParameter(com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int):63:63 -> a
     20:20:boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType):42 -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.GN:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria -> com.android.tools.r8.internal.XN:
     1:1:void <init>():15:15 -> <init>
     boolean shouldReprocess(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo,int,com.android.tools.r8.graph.DexType) -> a
     boolean shouldReprocessDueToDynamicType() -> a
-com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> com.android.tools.r8.internal.FN:
+com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder -> com.android.tools.r8.internal.WN:
     boolean reprocessDueToAbstractValue -> a
     boolean reprocessDueToDynamicType -> b
     boolean reprocessDueToNullability -> c
@@ -104667,7 +105358,7 @@
     1:1:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder setReprocessDueToDynamicType():70:70 -> c
     1:1:com.android.tools.r8.optimize.argumentpropagation.reprocessingcriteria.ParameterReprocessingCriteria$Builder setReprocessDueToNullability():75:75 -> d
     1:1:boolean shouldAlwaysReprocess():80:80 -> e
-com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis -> com.android.tools.r8.internal.qi:
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsAnalysis -> com.android.tools.r8.internal.ui:
     java.util.Map constraints -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.collections.ProgramMethodSet optimizableVirtualMethods -> c
@@ -104677,9 +105368,9 @@
     2:12:void <init>(com.android.tools.r8.graph.AppView):72:82 -> <init>
     boolean lambda$computeEffectivelyUnusedConstraints$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value) -> a
     1:3:void initializeOptimizableVirtualMethods(java.util.Set):87:89 -> a
-    4:4:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> a
+    4:4:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> a
     4:4:void initializeOptimizableVirtualMethods(java.util.Set):89 -> a
-    5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> a
+    5:5:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> a
     5:5:void initializeOptimizableVirtualMethods(java.util.Set):89 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void initializeOptimizableVirtualMethods(java.util.Set):98:98 -> a
@@ -104707,7 +105398,7 @@
     84:88:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):112 -> a
     89:99:void scan(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):115:125 -> a
     100:102:void onMethodPruned(com.android.tools.r8.graph.ProgramMethod):221:223 -> a
-com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph -> com.android.tools.r8.internal.ri:
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraph -> com.android.tools.r8.internal.vi:
     java.util.Map nodes -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -104736,7 +105427,7 @@
     1:1:com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode lambda$getOrCreateNode$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.optimize.argumentpropagation.codescanner.MethodParameter):103:103 -> b
     2:7:void remove(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):107:112 -> b
     1:3:boolean verifyContains(com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode):161:163 -> c
-com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode -> com.android.tools.r8.internal.si:
+com.android.tools.r8.optimize.argumentpropagation.unusedarguments.EffectivelyUnusedArgumentsGraphNode -> com.android.tools.r8.internal.wi:
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     boolean unoptimizable -> e
@@ -104767,14 +105458,14 @@
     1:1:void removeUnusedSuccessors():94:94 -> h
     1:1:void setUnoptimizable():106:106 -> i
     1:7:void setUnused():110:116 -> j
-com.android.tools.r8.optimize.argumentpropagation.utils.BidirectedGraph -> com.android.tools.r8.internal.W4:
+com.android.tools.r8.optimize.argumentpropagation.utils.BidirectedGraph -> com.android.tools.r8.internal.Y4:
     1:1:void <init>():14:14 -> <init>
     void forEachNeighbor(java.lang.Object,java.util.function.Consumer) -> a
     void forEachNode(java.util.function.Consumer) -> a
     1:3:java.util.List computeStronglyConnectedComponents():25:27 -> a
     4:9:void lambda$computeStronglyConnectedComponents$0(java.util.Set,java.util.List,java.lang.Object):29:34 -> a
     10:15:java.util.Set computeStronglyConnectedComponent(java.lang.Object):40:45 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal -> com.android.tools.r8.internal.Pf:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal -> com.android.tools.r8.internal.Tf:
     java.util.Map states -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List newlySeenButNotFinishedRoots -> d
@@ -104825,12 +105516,12 @@
     16:18:void com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal.markFinished(com.android.tools.r8.graph.DexProgramClass):187:189 -> j
     16:18:void traverse(com.android.tools.r8.graph.DexProgramClass):133 -> j
     void visit(com.android.tools.r8.graph.DexProgramClass) -> k
-com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.Of:
+com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState -> com.android.tools.r8.internal.Sf:
     com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState FINISHED -> c
     com.android.tools.r8.optimize.argumentpropagation.utils.DepthFirstTopDownClassHierarchyTraversal$TraversalState SEEN -> b
     1:5:void <clinit>():30:34 -> <clinit>
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
-com.android.tools.r8.optimize.argumentpropagation.utils.ParameterRemovalUtils -> com.android.tools.r8.internal.EN:
+com.android.tools.r8.optimize.argumentpropagation.utils.ParameterRemovalUtils -> com.android.tools.r8.internal.VN:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:2:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):17:18 -> a
@@ -104841,7 +105532,7 @@
     4:6:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):19 -> a
     7:10:boolean canRemoveUnusedParametersFrom(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):22:25 -> a
     11:22:boolean canRemoveUnusedParameter(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,int):30:41 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph -> com.android.tools.r8.internal.ZO:
+com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph -> com.android.tools.r8.internal.rP:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.ImmediateProgramSubtypingInfo immediateSubtypingInfo -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo):20:22 -> <init>
@@ -104858,7 +105549,7 @@
     5:5:void com.android.tools.r8.optimize.argumentpropagation.utils.ProgramClassesBidirectedGraph.forEachNeighbor(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):28:28 -> a
     5:5:void forEachNeighbor(java.lang.Object,java.util.function.Consumer):13 -> a
     6:6:void forEachNode(java.util.function.Consumer):33:33 -> a
-com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.android.tools.r8.internal.n50:
+com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils -> com.android.tools.r8.internal.J50:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:com.android.tools.r8.ir.analysis.type.DynamicType widenDynamicReceiverType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.DynamicType):28:29 -> a
@@ -104878,7 +105569,7 @@
     23:27:boolean com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):92:96 -> a
     23:27:boolean com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.hasTrivialLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):87 -> a
     23:27:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):64 -> a
-    28:28:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> a
+    28:28:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> a
     28:28:boolean com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97 -> a
     28:28:boolean com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.hasTrivialLowerBound(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType):87 -> a
     28:28:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):64 -> a
@@ -104893,7 +105584,7 @@
     34:38:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):69:73 -> a
     39:43:boolean com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):92:96 -> a
     39:43:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):82 -> a
-    44:44:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> a
+    44:44:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> a
     44:44:boolean com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97 -> a
     44:44:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):82 -> a
     45:47:boolean com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):100:102 -> a
@@ -104901,7 +105592,7 @@
     48:48:boolean com.android.tools.r8.optimize.argumentpropagation.utils.WideningUtils.isEffectivelyFinal(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):101:101 -> a
     48:48:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):82 -> a
     49:49:com.android.tools.r8.ir.analysis.type.DynamicType internalWidenDynamicClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.DynamicType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability):82:82 -> a
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.g6:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting -> com.android.tools.r8.internal.i6:
     com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult result -> b
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -104909,7 +105600,7 @@
     1:4:void <clinit>():70:73 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):81:83 -> <init>
     1:1:void run():87:87 -> a
-    2:2:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():1563:1563 -> a
+    2:2:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():1518:1518 -> a
     2:2:void run():87 -> a
     3:26:void run():88:111 -> a
     27:27:void lambda$run$0(com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexProgramClass):90:90 -> a
@@ -104988,7 +105679,7 @@
     9:15:java.util.Set com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.getCandidatesForHoisting(java.util.Set):139:145 -> b
     9:15:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):133 -> b
     16:17:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):133:134 -> b
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.h6:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.j6:
     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
@@ -105008,7 +105699,7 @@
     1:2:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):37:38 -> e
     3:3:boolean hasCodeRewritings():85:85 -> e
     1:1:boolean isContextFreeForMethods():80:80 -> g
-com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.i6:
+com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingResult -> com.android.tools.r8.internal.k6:
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap bridgeToHoistedBridgeMap -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -105034,43 +105725,38 @@
     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.optimize.interfaces.analysis.BottomCfFrameState -> com.android.tools.r8.internal.Q5:
+com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState -> com.android.tools.r8.internal.S5:
     com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState INSTANCE -> c
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():21:21 -> <init>
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState markInitialized(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType) -> a
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):34:34 -> a
     2:2:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    2:2:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.pop():61 -> a
-    2:2:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.pop(java.util.function.BiFunction):66 -> a
-    2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction):17 -> a
-    3:3:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    3:3:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.pop():61 -> a
-    3:3:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.popAndInitialize(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):72 -> a
-    3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popAndInitialize(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):17 -> a
-    4:4:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    4:4:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.pop():61 -> a
-    4:4:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):80 -> a
-    4:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):17 -> a
-    5:5:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    5:5:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):104 -> a
-    5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):17 -> a
-    6:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType[]):85:85 -> a
-    7:7:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    7:7:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.pop():61 -> a
-    7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType[]):85 -> a
-    8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):90:90 -> a
-    9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):222:222 -> a
-    9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):90 -> a
-    10:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):95:95 -> a
-    11:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):109:109 -> a
+    2:2:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):109 -> a
+    2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):17 -> a
+    3:3:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.pop(java.util.function.BiFunction):66:66 -> a
+    3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction):17 -> a
+    4:4:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.popAndInitialize(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):72:72 -> a
+    4:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popAndInitialize(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):17 -> a
+    5:5:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):85:85 -> a
+    5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):17 -> a
+    6:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType[]):90:90 -> a
+    7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):95:95 -> a
+    8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):237:237 -> a
+    8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):95 -> a
+    9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):100:100 -> a
+    10:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):114:114 -> a
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):39:39 -> b
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkStack(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):44:44 -> c
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState clear() -> h
-    1:1:int hashCode():119:119 -> hashCode
-    1:1:com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState getInstance():24:24 -> j
-com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig -> com.android.tools.r8.internal.R6:
-com.android.tools.r8.optimize.interfaces.analysis.CfFrameState -> com.android.tools.r8.internal.D7:
+    1:1:int hashCode():124:124 -> hashCode
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.popArray(com.android.tools.r8.graph.AppView):77:77 -> i
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popArray(com.android.tools.r8.graph.AppView):17 -> i
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState getInstance():24:24 -> k
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> l
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState pop():61 -> l
+com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig -> com.android.tools.r8.internal.T6:
+com.android.tools.r8.optimize.interfaces.analysis.CfFrameState -> com.android.tools.r8.internal.G7:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>():29:29 -> <init>
@@ -105086,7 +105772,7 @@
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction) -> a
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig) -> a
     1:1:boolean isGreaterThanOrEquals(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):29:29 -> a
-    2:3:boolean com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.isGreaterThanOrEquals(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):80:81 -> a
+    2:3:boolean com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.isGreaterThanOrEquals(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):79:80 -> a
     2:3:boolean isGreaterThanOrEquals(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):29 -> a
     4:4:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState error(java.lang.String):36:36 -> a
     5:5:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedLocal(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType,int):42:42 -> a
@@ -105116,132 +105802,134 @@
     59:59:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedLocal(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType,int):42:42 -> a
     51:51:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedLocal(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType,int):41:41 -> a
     60:60:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType):52:52 -> a
-    61:61:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.internalErrorUnexpectedStack(java.lang.String,java.lang.String):62:62 -> a
+    61:61:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,java.lang.String) -> a
     61:61:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType):52 -> a
-    62:62:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState internalError(java.lang.String,java.lang.String,java.lang.String):67:67 -> a
-    63:63:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    63:63:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState internalError(java.lang.String,java.lang.String,java.lang.String):67 -> a
-    64:64:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):123:123 -> a
-    65:65:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueType):146:146 -> a
-    66:66:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):153:153 -> a
-    66:66:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueType):146 -> a
-    67:67:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):159:159 -> a
-    68:68:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):57:57 -> a
-    68:68:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):159 -> a
-    69:70:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.ir.code.ValueType):95:96 -> a
-    69:70:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.ir.code.ValueType):91 -> a
-    69:70:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):57 -> a
-    69:70:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):159 -> a
-    71:71:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":74,"2":75,"3":76}}
-    74:74:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.ir.code.ValueType):98:98 -> a
-    74:74:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.ir.code.ValueType):91 -> a
-    74:74:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):57 -> a
-    74:74:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):159 -> a
+    62:62:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,java.lang.String):61:61 -> a
+    63:63:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState internalError(java.lang.String,java.lang.String,java.lang.String):66:66 -> a
+    64:64:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
+    64:64:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState internalError(java.lang.String,java.lang.String,java.lang.String):66 -> a
+    65:65:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):124:124 -> a
+    66:66:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueType):147:147 -> a
+    67:67:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):154:154 -> a
+    67:67:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.ValueType):147 -> a
+    68:68:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):160:160 -> a
+    69:69:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):57:57 -> a
+    69:69:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):160 -> a
+    70:71:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.ir.code.ValueType):95:96 -> a
+    70:71:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.ir.code.ValueType):91 -> a
+    70:71:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):57 -> a
+    70:71:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):160 -> a
+    72:72:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":75,"2":76,"3":77}}
     75:75:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.ir.code.ValueType):98:98 -> a
     75:75:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.ir.code.ValueType):91 -> a
     75:75:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):57 -> a
-    75:75:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):159 -> a
+    75:75:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):160 -> a
     76:76:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.ir.code.ValueType):98:98 -> a
     76:76:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.ir.code.ValueType):91 -> a
     76:76:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):57 -> a
-    76:76:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):159 -> a
-    72:72:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.ir.code.ValueType):98:98 -> a
-    72:72:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.ir.code.ValueType):91 -> a
-    72:72:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):57 -> a
-    72:72:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):159 -> a
-    73:73:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.internalErrorUnexpectedStack(java.lang.String,java.lang.String):62:62 -> a
+    76:76:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):160 -> a
+    77:77:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.ir.code.ValueType):98:98 -> a
+    77:77:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.ir.code.ValueType):91 -> a
+    77:77:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):57 -> a
+    77:77:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):160 -> a
+    73:73:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.ir.code.ValueType):98:98 -> a
+    73:73:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.ir.code.ValueType):91 -> a
     73:73:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):57 -> a
-    73:73:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):159 -> a
-    77:77:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popObject(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,java.util.function.BiFunction):168:168 -> a
-    78:80:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):170:172 -> a
-    81:85:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):171:175 -> a
-    86:86:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47:47 -> a
-    86:86:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):176 -> a
-    87:92:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.graph.DexType):36:41 -> a
-    87:92:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.graph.DexType):32 -> a
-    87:92:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47 -> a
-    87:92:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):176 -> a
-    93:93:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":97,"2":98,"3":99}}
-    97:97:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.graph.DexType):42:42 -> a
-    97:97:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.graph.DexType):32 -> a
-    97:97:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47 -> a
-    97:97:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):176 -> a
+    73:73:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):160 -> a
+    74:74:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,java.lang.String):61:61 -> a
+    74:74:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.ir.code.ValueType):57 -> a
+    74:74:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$0(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):160 -> a
+    78:78:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popObject(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,java.util.function.BiFunction):169:169 -> a
+    79:81:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):171:173 -> a
+    82:86:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):172:176 -> a
+    87:87:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47:47 -> a
+    87:87:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):177 -> a
+    88:93:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.graph.DexType):36:41 -> a
+    88:93:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.graph.DexType):32 -> a
+    88:93:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47 -> a
+    88:93:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):177 -> a
+    94:94:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":98,"2":99,"3":100}}
     98:98:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.graph.DexType):42:42 -> a
     98:98:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.graph.DexType):32 -> a
     98:98:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47 -> a
-    98:98:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):176 -> a
+    98:98:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):177 -> a
     99:99:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.graph.DexType):42:42 -> a
     99:99:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.graph.DexType):32 -> a
     99:99:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47 -> a
-    99:99:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):176 -> a
-    94:94:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.graph.DexType):42:42 -> a
-    94:94:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.graph.DexType):32 -> a
-    94:94:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47 -> a
-    94:94:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):176 -> a
-    95:95:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.graph.DexType):37:37 -> a
+    99:99:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):177 -> a
+    100:100:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.graph.DexType):42:42 -> a
+    100:100:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.graph.DexType):32 -> a
+    100:100:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47 -> a
+    100:100:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):177 -> a
+    95:95:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.graph.DexType):42:42 -> a
     95:95:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.graph.DexType):32 -> a
     95:95:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47 -> a
-    95:95:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):176 -> a
-    96:96:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.internalErrorUnexpectedStack(java.lang.String,java.lang.String):62:62 -> a
+    95:95:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):177 -> a
+    96:96:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.format(com.android.tools.r8.graph.DexType):37:37 -> a
+    96:96:java.lang.String com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState.formatExpected(com.android.tools.r8.graph.DexType):32 -> a
     96:96:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47 -> a
-    96:96:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):176 -> a
-    100:100:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingles(com.android.tools.r8.utils.TriFunction):193:193 -> a
-    101:101:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingleOrWide(java.util.function.BiFunction,java.util.function.BiFunction):201:201 -> a
-    102:102:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingleOrWide$6(java.util.function.BiFunction,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):202:202 -> a
-    103:103:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingleSingleOrWide(com.android.tools.r8.utils.TriFunction,java.util.function.BiFunction):208:208 -> a
-    104:104:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingleSingleOrWide$7(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):210:210 -> a
-    105:105:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingleSingleOrWide$8(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):210:210 -> a
-    106:106:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):304:304 -> a
-    107:107:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    107:107:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):304 -> a
-    108:108:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> a
+    96:96:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):177 -> a
+    97:97:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,java.lang.String):61:61 -> a
+    97:97:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.graph.DexType):47 -> a
+    97:97:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popObject$1(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):177 -> a
+    101:101:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingles(com.android.tools.r8.utils.TriFunction):194:194 -> a
+    102:102:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingleOrWide(java.util.function.BiFunction,java.util.function.BiFunction):202:202 -> a
+    103:103:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingleOrWide$6(java.util.function.BiFunction,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):203:203 -> a
+    104:104:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingleSingleOrWide(com.android.tools.r8.utils.TriFunction,java.util.function.BiFunction):209:209 -> a
+    105:105:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingleSingleOrWide$7(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):211:211 -> a
+    106:106:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingleSingleOrWide$8(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):211:211 -> a
+    107:107:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):305:305 -> a
+    108:108:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
     108:108:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):305 -> a
-    109:109:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isLong():0:0 -> a
+    109:109:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isFloat():0:0 -> a
     109:109:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):306 -> a
-    110:110:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDouble():0:0 -> a
+    110:110:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isLong():0:0 -> a
     110:110:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):307 -> a
-    111:117:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):304:310 -> a
-    118:118:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):308:308 -> a
-    119:119:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):316:316 -> a
-    120:120:com.android.tools.r8.cf.code.frame.FrameType lambda$join$9(com.android.tools.r8.cf.code.frame.FrameType):317:317 -> a
-    121:121:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):322:322 -> a
+    111:111:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isDouble():0:0 -> a
+    111:111:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):308 -> a
+    112:118:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):305:311 -> a
+    119:119:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement,com.android.tools.r8.graph.AppView,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):309:309 -> a
+    120:120:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState):317:317 -> a
+    121:121:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):323:323 -> a
     122:122:boolean com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.isBottom():0:0 -> a
-    122:122:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):322 -> a
+    122:122:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):323 -> a
     123:123:boolean com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.isError():0:0 -> a
-    123:123:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):322 -> a
+    123:123:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):323 -> a
     124:124:boolean com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.isBottom():0:0 -> a
-    124:124:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):325 -> a
+    124:124:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):326 -> a
     125:125:boolean com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.isError():0:0 -> a
-    125:125:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):325 -> a
-    126:126:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):328:328 -> a
+    125:125:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):326 -> a
+    126:126:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):329:329 -> a
     127:127:boolean com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.isConcrete():0:0 -> a
-    127:127:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):328 -> a
-    128:128:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):328:328 -> a
+    127:127:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):329 -> a
+    128:128:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):329:329 -> a
     129:129:boolean com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.isConcrete():0:0 -> a
-    129:129:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):329 -> a
-    130:131:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):329:330 -> a
+    129:129:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):330 -> a
+    130:131:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,java.util.function.UnaryOperator):330:331 -> a
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame) -> b
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState):29:29 -> b
-    2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popObject(java.util.function.BiFunction):157:157 -> b
-    3:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingle$3(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):186:188 -> b
+    2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popObject(java.util.function.BiFunction):158:158 -> b
+    3:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingle$3(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):187:189 -> b
     6:6:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType):52:52 -> b
-    6:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingle$3(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):188 -> b
-    7:7:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.internalErrorUnexpectedStack(java.lang.String,java.lang.String):62:62 -> b
+    6:6:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingle$3(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):189 -> b
+    7:7:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,java.lang.String):61:61 -> b
     7:7:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.errorUnexpectedStack(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType):52 -> b
-    7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingle$3(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):188 -> b
-    8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingles$4(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):195:195 -> b
-    9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingles$5(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):195:195 -> b
+    7:7:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingle$3(java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):189 -> b
+    8:8:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingles$4(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):196:196 -> b
+    9:9:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popSingles$5(com.android.tools.r8.utils.TriFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):196:196 -> b
+    10:10:com.android.tools.r8.cf.code.frame.FrameType lambda$join$9(com.android.tools.r8.cf.code.frame.FrameType):318:318 -> b
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> c
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkStack(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame) -> c
-    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingle(java.util.function.BiFunction):184:184 -> c
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingle(java.util.function.BiFunction):185:185 -> c
     com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState asConcrete() -> e
     com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState asError() -> f
     1:1:com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState bottom():32:32 -> g
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState clear() -> h
-    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingle():180:180 -> i
-com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState -> com.android.tools.r8.internal.jd:
+    com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popArray(com.android.tools.r8.graph.AppView) -> i
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popSingle():181:181 -> j
+com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState -> com.android.tools.r8.internal.md:
     java.util.ArrayDeque stack -> d
     boolean $assertionsDisabled -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap locals -> c
@@ -105250,12 +105938,12 @@
     1:1:void <init>():44:44 -> <init>
     2:5:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectAVLTreeMap,java.util.ArrayDeque,int):48:51 -> <init>
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):71:71 -> a
-    2:2:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult com.android.tools.r8.cf.code.CfAssignability.isFrameAssignable(com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.graph.AppView):130:130 -> a
+    2:2:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult com.android.tools.r8.cf.code.CfAssignability.isFrameAssignable(com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.graph.AppView):137:137 -> a
     2:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):73 -> a
     3:3:boolean com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult.isSuccessful():0:0 -> a
-    3:3:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult com.android.tools.r8.cf.code.CfAssignability.isFrameAssignable(com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.graph.AppView):131 -> a
+    3:3:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult com.android.tools.r8.cf.code.CfAssignability.isFrameAssignable(com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.graph.AppView):138 -> a
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):73 -> a
-    4:4:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult com.android.tools.r8.cf.code.CfAssignability.isFrameAssignable(com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.graph.AppView):132:132 -> a
+    4:4:com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult com.android.tools.r8.cf.code.CfAssignability.isFrameAssignable(com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.cf.code.CfFrame,com.android.tools.r8.graph.AppView):139:139 -> a
     4:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):73 -> a
     5:5:boolean com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult.isFailed():0:0 -> a
     5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState check(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):74 -> a
@@ -105313,199 +106001,198 @@
     51:52:com.android.tools.r8.cf.code.frame.PreciseFrameType com.android.tools.r8.cf.code.CfFrame.getInitializedFrameType(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):292:293 -> a
     51:52:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState markInitialized(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):127 -> a
     53:59:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState markInitialized(com.android.tools.r8.cf.code.frame.UninitializedFrameType,com.android.tools.r8.graph.DexType):125:131 -> a
-    60:60:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction):141:141 -> a
-    61:61:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    61:61:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState.pop():61 -> a
-    61:61:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction):143 -> a
-    62:64:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction):145:147 -> a
-    65:65:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popAndInitialize(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):153:153 -> a
-    66:71:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):155:160 -> a
-    72:78:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):159:165 -> a
-    79:90:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeConstructorMismatchError(com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):176:187 -> a
-    79:90:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):168 -> a
-    91:91:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    91:91:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeConstructorMismatchError(com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):187 -> a
-    91:91:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):168 -> a
-    92:92:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":95,"2":96,"3":97}}
-    95:95:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeInitializedObjectError(com.android.tools.r8.cf.code.frame.PreciseFrameType):191:191 -> a
-    95:95:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):170 -> a
-    96:96:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeInitializedObjectError(com.android.tools.r8.cf.code.frame.PreciseFrameType):191:191 -> a
-    96:96:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):170 -> a
+    60:66:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState pop(java.util.function.BiFunction):141:147 -> a
+    67:67:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popAndInitialize(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):153:153 -> a
+    68:73:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):155:160 -> a
+    74:80:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):159:165 -> a
+    81:92:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeConstructorMismatchError(com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):176:187 -> a
+    81:92:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):168 -> a
+    93:93:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
+    93:93:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeConstructorMismatchError(com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):187 -> a
+    93:93:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):168 -> a
+    94:94:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":97,"2":98,"3":99}}
     97:97:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeInitializedObjectError(com.android.tools.r8.cf.code.frame.PreciseFrameType):191:191 -> a
     97:97:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):170 -> a
-    93:93:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeInitializedObjectError(com.android.tools.r8.cf.code.frame.PreciseFrameType):191:191 -> a
-    93:93:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):170 -> a
-    94:94:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    94:94:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeInitializedObjectError(com.android.tools.r8.cf.code.frame.PreciseFrameType):191 -> a
-    94:94:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):170 -> a
-    98:98:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):199:199 -> a
-    99:105:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popInitialized$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):201:207 -> a
-    106:107:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType[]):214:215 -> a
-    108:108:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):222:222 -> a
-    109:110:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):227:228 -> a
-    111:111:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":118,"2":119,"3":120}}
-    118:118:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):237:237 -> a
-    118:118:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):229 -> a
-    119:119:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):237:237 -> a
-    119:119:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):229 -> a
-    120:120:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):237:237 -> a
-    120:120:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):229 -> a
-    112:114:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):239:241 -> a
-    112:114:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):229 -> a
-    115:115:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    115:115:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):237 -> a
-    115:115:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):229 -> a
-    116:117:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):231:232 -> a
-    121:121:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):252:252 -> a
-    122:122:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":134,"2":135,"3":136,"4":137,"5":138}}
-    134:134:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):254:254 -> a
-    135:135:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):254:254 -> a
-    136:136:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):254:254 -> a
-    137:137:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):254:254 -> a
-    138:138:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):254:254 -> a
-    123:123:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    123:123:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):254 -> a
-    124:126:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):256:258 -> a
-    127:127:boolean com.android.tools.r8.cf.code.CfAssignability.isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.graph.AppView):111:111 -> a
-    127:127:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):257 -> a
-    128:133:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):259:264 -> a
-    139:140:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):269:270 -> a
-    141:151:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.storeLocalError(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):282:292 -> a
-    141:151:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):271 -> a
-    152:152:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    152:152:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.storeLocalError(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):292 -> a
-    152:152:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):271 -> a
-    153:155:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):273:275 -> a
-    156:157:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):297:298 -> a
-    158:181:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):311:334 -> a
-    158:181:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):298 -> a
-    182:185:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):387:390 -> a
-    182:185:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):343 -> a
-    182:185:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):298 -> a
-    186:186:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinSingleLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.CfFrame$Builder):411:411 -> a
-    186:186:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):389 -> a
-    186:186:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):343 -> a
-    186:186:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):298 -> a
-    187:193:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):392:398 -> a
-    187:193:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):343 -> a
-    187:193:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):298 -> a
-    194:194:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinWideLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.CfFrame$Builder):419:419 -> a
-    194:194:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):397 -> a
-    194:194:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):343 -> a
-    194:194:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):298 -> a
-    195:196:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):400:401 -> a
-    195:196:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):343 -> a
-    195:196:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):298 -> a
-    197:198:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):347:348 -> a
-    197:198:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):298 -> a
-    199:199:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299:299 -> a
-    200:206:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):525:531 -> a
-    200:206:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    207:207:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":242,"2":243,"3":244,"4":245,"5":246}}
-    242:242:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):532:532 -> a
-    242:242:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    243:243:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):532:532 -> a
-    243:243:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    244:244:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):532:532 -> a
-    244:244:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    245:245:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):532:532 -> a
-    245:245:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    246:246:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):532:532 -> a
-    246:246:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    208:210:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):536:538 -> a
-    208:210:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    211:211:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    211:211:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):532 -> a
-    211:211:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    212:214:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):541:543 -> a
-    212:214:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    215:215:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isOneWord():0:0 -> a
-    215:215:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):543 -> a
-    215:215:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    216:216:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":247,"2":248,"3":249,"4":250,"5":251}}
-    247:247:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567:567 -> a
-    247:247:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):544 -> a
-    247:247:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    248:248:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567:567 -> a
-    248:248:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):544 -> a
-    248:248:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    249:249:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567:567 -> a
-    249:249:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):544 -> a
-    249:249:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    250:250:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567:567 -> a
-    250:250:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):544 -> a
-    250:250:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    251:251:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567:567 -> a
-    251:251:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):544 -> a
-    251:251:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    217:219:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):571:573 -> a
-    217:219:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):544 -> a
-    217:219:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    220:220:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    220:220:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567 -> a
-    220:220:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):544 -> a
-    220:220:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    221:225:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):546:550 -> a
-    221:225:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    226:226:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isTwoWord():0:0 -> a
-    226:226:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):550 -> a
-    226:226:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    227:227:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":252,"2":253,"3":254,"4":255,"5":256}}
-    252:252:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567:567 -> a
-    252:252:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):551 -> a
-    252:252:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    253:253:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567:567 -> a
-    253:253:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):551 -> a
-    253:253:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    254:254:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567:567 -> a
-    254:254:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):551 -> a
-    254:254:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    255:255:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567:567 -> a
-    255:255:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):551 -> a
-    255:255:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    256:256:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567:567 -> a
-    256:256:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):551 -> a
-    256:256:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    228:230:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):571:573 -> a
-    228:230:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):551 -> a
-    228:230:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    231:231:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    231:231:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):567 -> a
-    231:231:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):551 -> a
-    231:231:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    232:238:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):553:559 -> a
-    232:238:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    239:239:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
-    239:239:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):560 -> a
-    239:239:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):299 -> a
-    240:241:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):303:304 -> a
-    257:260:void joinLocalsWithDifferentIndices(int,com.android.tools.r8.cf.code.frame.FrameType,int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):359:362 -> a
-    261:264:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.setLocalToTop(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.CfFrame$Builder):505:508 -> a
-    261:264:void joinLocalsWithDifferentIndices(int,com.android.tools.r8.cf.code.frame.FrameType,int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):369 -> a
-    265:268:void joinLocalsWithDifferentIndices(int,com.android.tools.r8.cf.code.frame.FrameType,int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):373:376 -> a
-    269:272:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.setLocalToTop(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.CfFrame$Builder):505:508 -> a
-    269:272:void joinLocalsWithDifferentIndices(int,com.android.tools.r8.cf.code.frame.FrameType,int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):363 -> a
-    273:273:void joinLocalsWithDifferentIndices(int,com.android.tools.r8.cf.code.frame.FrameType,int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):364:364 -> a
-    274:301:void handleOverlappingLocals(int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):431:458 -> a
-    302:311:void joinLocalsOnlyPresentInOne(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):467:476 -> a
-    312:315:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.setLocalToTop(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.CfFrame$Builder):505:508 -> a
-    312:315:void joinLocalsOnlyPresentInOne(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):474 -> a
-    316:322:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry nextLocal(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):482:488 -> a
-    323:324:void setSingleLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):513:514 -> a
+    98:98:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeInitializedObjectError(com.android.tools.r8.cf.code.frame.PreciseFrameType):191:191 -> a
+    98:98:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):170 -> a
+    99:99:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeInitializedObjectError(com.android.tools.r8.cf.code.frame.PreciseFrameType):191:191 -> a
+    99:99:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):170 -> a
+    95:95:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeInitializedObjectError(com.android.tools.r8.cf.code.frame.PreciseFrameType):191:191 -> a
+    95:95:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):170 -> a
+    96:96:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
+    96:96:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.popAndInitializeInitializedObjectError(com.android.tools.r8.cf.code.frame.PreciseFrameType):191 -> a
+    96:96:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popAndInitialize$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):170 -> a
+    100:100:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.BiFunction):214:214 -> a
+    101:107:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popInitialized$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.function.BiFunction,com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):216:222 -> a
+    108:109:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popInitialized(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType[]):229:230 -> a
+    110:110:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.graph.DexType):237:237 -> a
+    111:112:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):242:243 -> a
+    113:113:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":120,"2":121,"3":122}}
+    120:120:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:252 -> a
+    120:120:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):244 -> a
+    121:121:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:252 -> a
+    121:121:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):244 -> a
+    122:122:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):252:252 -> a
+    122:122:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):244 -> a
+    114:116:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):254:256 -> a
+    114:116:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):244 -> a
+    117:117:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
+    117:117:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.pushError(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):252 -> a
+    117:117:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):244 -> a
+    118:119:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState push(com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig,com.android.tools.r8.cf.code.frame.PreciseFrameType):246:247 -> a
+    123:123:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):267:267 -> a
+    124:124:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":136,"2":137,"3":138,"4":139,"5":140}}
+    136:136:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):269:269 -> a
+    137:137:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):269:269 -> a
+    138:138:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):269:269 -> a
+    139:139:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):269:269 -> a
+    140:140:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):269:269 -> a
+    125:125:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
+    125:125:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):269 -> a
+    126:128:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):271:273 -> a
+    129:129:boolean com.android.tools.r8.cf.code.CfAssignability.isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.ValueType,com.android.tools.r8.graph.AppView):118:118 -> a
+    129:129:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):272 -> a
+    130:135:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState readLocal(com.android.tools.r8.graph.AppView,int,com.android.tools.r8.ir.code.ValueType,java.util.function.BiFunction):274:279 -> a
+    141:142:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):284:285 -> a
+    143:153:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.storeLocalError(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):297:307 -> a
+    143:153:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):286 -> a
+    154:154:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
+    154:154:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.storeLocalError(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):307 -> a
+    154:154:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):286 -> a
+    155:157:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState storeLocal(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.CfAnalysisConfig):288:290 -> a
+    158:159:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):312:313 -> a
+    160:183:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):326:349 -> a
+    160:183:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):313 -> a
+    184:187:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):402:405 -> a
+    184:187:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):358 -> a
+    184:187:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):313 -> a
+    188:188:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinSingleLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.frame.SingleFrameType,com.android.tools.r8.cf.code.CfFrame$Builder):426:426 -> a
+    188:188:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):404 -> a
+    188:188:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):358 -> a
+    188:188:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):313 -> a
+    189:195:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):407:413 -> a
+    189:195:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):358 -> a
+    189:195:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):313 -> a
+    196:196:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinWideLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.frame.WideFrameType,com.android.tools.r8.cf.code.CfFrame$Builder):434:434 -> a
+    196:196:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):412 -> a
+    196:196:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):358 -> a
+    196:196:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):313 -> a
+    197:198:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocalsWithSameIndex(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):415:416 -> a
+    197:198:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):358 -> a
+    197:198:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):313 -> a
+    199:200:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinLocals(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectSortedMap,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):362:363 -> a
+    199:200:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):313 -> a
+    201:201:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314:314 -> a
+    202:208:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):540:546 -> a
+    202:208:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    209:209:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":244,"2":245,"3":246,"4":247,"5":248}}
+    244:244:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):547:547 -> a
+    244:244:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    245:245:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):547:547 -> a
+    245:245:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    246:246:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):547:547 -> a
+    246:246:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    247:247:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):547:547 -> a
+    247:247:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    248:248:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):547:547 -> a
+    248:248:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    210:212:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):551:553 -> a
+    210:212:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    213:213:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
+    213:213:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):547 -> a
+    213:213:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    214:216:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):556:558 -> a
+    214:216:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    217:217:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isOneWord():0:0 -> a
+    217:217:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):558 -> a
+    217:217:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    218:218:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":249,"2":250,"3":251,"4":252,"5":253}}
+    249:249:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582:582 -> a
+    249:249:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):559 -> a
+    249:249:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    250:250:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582:582 -> a
+    250:250:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):559 -> a
+    250:250:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    251:251:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582:582 -> a
+    251:251:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):559 -> a
+    251:251:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    252:252:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582:582 -> a
+    252:252:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):559 -> a
+    252:252:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    253:253:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582:582 -> a
+    253:253:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):559 -> a
+    253:253:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    219:221:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):586:588 -> a
+    219:221:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):559 -> a
+    219:221:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    222:222:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
+    222:222:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582 -> a
+    222:222:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):559 -> a
+    222:222:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    223:227:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):561:565 -> a
+    223:227:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    228:228:boolean com.android.tools.r8.cf.code.frame.BaseFrameType.isTwoWord():0:0 -> a
+    228:228:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):565 -> a
+    228:228:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    229:229:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":254,"2":255,"3":256,"4":257,"5":258}}
+    254:254:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582:582 -> a
+    254:254:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):566 -> a
+    254:254:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    255:255:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582:582 -> a
+    255:255:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):566 -> a
+    255:255:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    256:256:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582:582 -> a
+    256:256:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):566 -> a
+    256:256:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    257:257:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582:582 -> a
+    257:257:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):566 -> a
+    257:257:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    258:258:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582:582 -> a
+    258:258:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):566 -> a
+    258:258:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    230:232:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):586:588 -> a
+    230:232:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):566 -> a
+    230:232:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    233:233:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
+    233:233:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStackImpreciseJoinError(int,com.android.tools.r8.cf.code.frame.PreciseFrameType,com.android.tools.r8.cf.code.frame.PreciseFrameType):582 -> a
+    233:233:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):566 -> a
+    233:233:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    234:240:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):568:574 -> a
+    234:240:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    241:241:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> a
+    241:241:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.joinStack(java.util.Deque,com.android.tools.r8.cf.code.CfFrame$Builder):575 -> a
+    241:241:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):314 -> a
+    242:243:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState join(com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState,java.util.function.UnaryOperator):318:319 -> a
+    259:262:void joinLocalsWithDifferentIndices(int,com.android.tools.r8.cf.code.frame.FrameType,int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):374:377 -> a
+    263:266:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.setLocalToTop(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.CfFrame$Builder):520:523 -> a
+    263:266:void joinLocalsWithDifferentIndices(int,com.android.tools.r8.cf.code.frame.FrameType,int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):384 -> a
+    267:270:void joinLocalsWithDifferentIndices(int,com.android.tools.r8.cf.code.frame.FrameType,int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):388:391 -> a
+    271:274:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.setLocalToTop(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.CfFrame$Builder):520:523 -> a
+    271:274:void joinLocalsWithDifferentIndices(int,com.android.tools.r8.cf.code.frame.FrameType,int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):378 -> a
+    275:275:void joinLocalsWithDifferentIndices(int,com.android.tools.r8.cf.code.frame.FrameType,int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):379:379 -> a
+    276:303:void handleOverlappingLocals(int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder):446:473 -> a
+    304:313:void joinLocalsOnlyPresentInOne(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):482:491 -> a
+    314:317:void com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.setLocalToTop(int,com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.cf.code.CfFrame$Builder):520:523 -> a
+    314:317:void joinLocalsOnlyPresentInOne(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator,com.android.tools.r8.cf.code.CfFrame$Builder,java.util.function.UnaryOperator):489 -> a
+    318:324:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ObjectMap$Entry nextLocal(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):497:503 -> a
+    325:326:void setSingleLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):528:529 -> a
     1:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):84:85 -> b
     3:3:boolean com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult.isFailed():0:0 -> b
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):86 -> b
     4:4:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):87:87 -> b
     5:5:com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.error(java.lang.String):36:36 -> b
     5:5:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):87 -> b
-    6:12:void previousLocal(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):494:500 -> b
-    13:16:void setWideLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):518:521 -> b
+    6:10:boolean com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.isArrayTypeOrNull(com.android.tools.r8.cf.code.frame.FrameType):202:206 -> b
+    6:10:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popArray$1(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):198 -> b
+    11:11:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState lambda$popArray$1(com.android.tools.r8.optimize.interfaces.analysis.CfFrameState,com.android.tools.r8.cf.code.frame.PreciseFrameType):198:198 -> b
+    12:18:void previousLocal(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator):509:515 -> b
+    19:22:void setWideLocalToTop(int,com.android.tools.r8.cf.code.CfFrame$Builder):533:536 -> b
     1:2:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkStack(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):94:95 -> c
     3:3:boolean com.android.tools.r8.cf.code.CfAssignability$AssignabilityResult.isFailed():0:0 -> c
     3:3:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkStack(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame):96 -> c
@@ -105517,16 +106204,17 @@
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState.clone():56:56 -> d
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState clone():37 -> d
     com.android.tools.r8.optimize.interfaces.analysis.ConcreteCfFrameState asConcrete() -> e
-    1:5:boolean equals(java.lang.Object):582:586 -> equals
+    1:5:boolean equals(java.lang.Object):597:601 -> equals
     1:1:com.android.tools.r8.optimize.interfaces.analysis.BottomCfFrameState com.android.tools.r8.optimize.interfaces.analysis.CfFrameState.bottom():32:32 -> h
     1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState clear():104 -> h
-    1:1:int hashCode():591:591 -> hashCode
-com.android.tools.r8.optimize.interfaces.analysis.EmptyOpenClosedInterfacesAnalysis -> com.android.tools.r8.internal.Gi:
+    1:1:int hashCode():606:606 -> hashCode
+    1:1:com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popArray(com.android.tools.r8.graph.AppView):196:196 -> i
+com.android.tools.r8.optimize.interfaces.analysis.EmptyOpenClosedInterfacesAnalysis -> com.android.tools.r8.internal.Ki:
     com.android.tools.r8.optimize.interfaces.analysis.EmptyOpenClosedInterfacesAnalysis INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:com.android.tools.r8.optimize.interfaces.analysis.EmptyOpenClosedInterfacesAnalysis getInstance():18:18 -> b
-com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState -> com.android.tools.r8.internal.Mj:
+com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState -> com.android.tools.r8.internal.Rj:
     java.lang.String message -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
@@ -105561,17 +106249,18 @@
     253:253:java.lang.String format(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState$FormatKind):74:74 -> a
     222:233:java.lang.String format(com.android.tools.r8.cf.code.frame.FrameType,com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState$FormatKind):74:85 -> a
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkLocals(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame) -> b
-    1:1:java.lang.String formatActual(com.android.tools.r8.cf.code.frame.FrameType):47:47 -> b
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState checkStack(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.code.CfFrame) -> c
-    1:1:java.lang.String formatExpected(com.android.tools.r8.cf.code.frame.FrameType):51:51 -> c
+    1:1:java.lang.String formatActual(com.android.tools.r8.cf.code.frame.FrameType):47:47 -> c
+    1:1:java.lang.String formatExpected(com.android.tools.r8.cf.code.frame.FrameType):51:51 -> d
     com.android.tools.r8.optimize.interfaces.analysis.ErroneousCfFrameState asError() -> f
     com.android.tools.r8.optimize.interfaces.analysis.CfFrameState clear() -> h
-    1:1:int hashCode():202:202 -> hashCode
-    1:1:java.lang.String getMessage():103:103 -> j
-com.android.tools.r8.optimize.interfaces.analysis.OpenClosedInterfacesAnalysis -> com.android.tools.r8.internal.IM:
+    1:1:int hashCode():207:207 -> hashCode
+    com.android.tools.r8.optimize.interfaces.analysis.CfFrameState popArray(com.android.tools.r8.graph.AppView) -> i
+    1:1:java.lang.String getMessage():103:103 -> k
+com.android.tools.r8.optimize.interfaces.analysis.OpenClosedInterfacesAnalysis -> com.android.tools.r8.internal.ZM:
     1:1:void <init>():10:10 -> <init>
     1:1:com.android.tools.r8.optimize.interfaces.analysis.EmptyOpenClosedInterfacesAnalysis empty():13:13 -> a
-com.android.tools.r8.optimize.interfaces.collection.DefaultOpenClosedInterfacesCollection -> com.android.tools.r8.internal.Bf:
+com.android.tools.r8.optimize.interfaces.collection.DefaultOpenClosedInterfacesCollection -> com.android.tools.r8.internal.Ff:
     com.android.tools.r8.optimize.interfaces.collection.DefaultOpenClosedInterfacesCollection INSTANCE -> b
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -105579,7 +106268,7 @@
     com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems) -> a
     1:1:com.android.tools.r8.optimize.interfaces.collection.DefaultOpenClosedInterfacesCollection getInstance():20:20 -> b
-com.android.tools.r8.optimize.interfaces.collection.NonEmptyOpenClosedInterfacesCollection -> com.android.tools.r8.internal.rJ:
+com.android.tools.r8.optimize.interfaces.collection.NonEmptyOpenClosedInterfacesCollection -> com.android.tools.r8.internal.yJ:
     java.util.Set openInterfaceTypes -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():14:14 -> <clinit>
@@ -105590,7 +106279,7 @@
     7:7:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection rewrittenWithLens(com.android.tools.r8.graph.GraphLens):33 -> a
     8:10:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection rewrittenWithLens(com.android.tools.r8.graph.GraphLens):33:35 -> a
     11:20:com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):40:49 -> a
-com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection -> com.android.tools.r8.internal.JM:
+com.android.tools.r8.optimize.interfaces.collection.OpenClosedInterfacesCollection -> com.android.tools.r8.internal.aN:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():27:27 -> <clinit>
     1:1:void <init>():27:27 -> <init>
@@ -105600,11 +106289,11 @@
     1:1:com.android.tools.r8.optimize.interfaces.collection.DefaultOpenClosedInterfacesCollection getDefault():30:30 -> a
     2:4:boolean isDefinitelyInstanceOfStaticType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):41:41 -> a
     5:5:com.android.tools.r8.ir.analysis.type.DynamicType lambda$isDefinitelyInstanceOfStaticType$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):42:42 -> a
-    6:6:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1098:1098 -> a
+    6:6:com.android.tools.r8.ir.analysis.type.DynamicTypeWithUpperBound com.android.tools.r8.ir.code.Value.getDynamicType(com.android.tools.r8.graph.AppView):1099:1099 -> a
     6:6:com.android.tools.r8.ir.analysis.type.DynamicType lambda$isDefinitelyInstanceOfStaticType$0(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):42 -> a
     7:51:boolean isDefinitelyInstanceOfStaticType(com.android.tools.r8.graph.AppView,java.util.function.Supplier,com.android.tools.r8.ir.analysis.type.TypeElement):47:91 -> a
     52:53:boolean lambda$isDefinitelyInstanceOfStaticType$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):65:66 -> a
-com.android.tools.r8.optimize.proto.ProtoNormalizer -> com.android.tools.r8.internal.FR:
+com.android.tools.r8.optimize.proto.ProtoNormalizer -> com.android.tools.r8.internal.ZR:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -105622,7 +106311,7 @@
     3:3:void lambda$computeGlobalReservationState$4(com.android.tools.r8.graph.DexMethodSignature,java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.DexMethodSignature):153:153 -> a
     4:4:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):57:57 -> a
     5:14:com.android.tools.r8.graph.DexEncodedMethod lambda$run$2(java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):76:85 -> a
-    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     15:15:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):66 -> a
     15:15:com.android.tools.r8.graph.DexEncodedMethod lambda$run$2(java.util.Map,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder,com.android.tools.r8.graph.DexEncodedMethod):85 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
@@ -105657,9 +106346,9 @@
     183:184:void lambda$computeGlobalReservationState$8(java.util.Set,com.android.tools.r8.utils.collections.DexMethodSignatureSet,com.android.tools.r8.graph.ProgramMethod):189 -> a
     185:185:com.android.tools.r8.graph.DexMethodSignature lambda$computeNewInstanceInitializerSignatures$11(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexMethodSignature):260:260 -> a
     186:187:java.util.Map computeInstanceInitializerCollisions(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):268:269 -> a
-    188:188:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):292:292 -> a
+    188:188:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):296:296 -> a
     188:188:java.util.Map computeInstanceInitializerCollisions(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):269 -> a
-    189:189:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):292:292 -> a
+    189:189:void com.android.tools.r8.graph.DexProgramClass.forEachProgramInstanceInitializer(java.util.function.Consumer):296:296 -> a
     189:189:java.util.Map computeInstanceInitializerCollisions(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):269 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     190:196:void lambda$computeInstanceInitializerCollisions$12(com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,java.util.Map,com.android.tools.r8.graph.ProgramMethod):271:277 -> a
@@ -105687,7 +106376,7 @@
     8:8:com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens.builder(com.android.tools.r8.graph.AppView):40:40 -> c
     8:8:void run(java.util.concurrent.ExecutorService):67 -> c
     9:47:void run(java.util.concurrent.ExecutorService):68:106 -> c
-com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState -> com.android.tools.r8.internal.DR:
+com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState -> com.android.tools.r8.internal.XR:
     java.util.Map reservedParameters -> a
     com.android.tools.r8.utils.collections.DexMethodSignatureSet unoptimizableSignatures -> b
     1:3:void <init>(java.util.Map,com.android.tools.r8.utils.collections.DexMethodSignatureSet):357:359 -> <init>
@@ -105706,7 +106395,7 @@
     11:11:com.android.tools.r8.graph.DexTypeList getReservedParameters(com.android.tools.r8.graph.DexMethodSignature):382:382 -> a
     12:13:java.util.Map selectDeterministicTarget(java.util.Map):364:365 -> a
     14:22:void lambda$selectDeterministicTarget$0(java.util.Map,com.android.tools.r8.graph.DexTypeList,java.util.Set):367:375 -> a
-com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState -> com.android.tools.r8.internal.ER:
+com.android.tools.r8.optimize.proto.ProtoNormalizer$LocalReservationState -> com.android.tools.r8.internal.YR:
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():390:390 -> <clinit>
@@ -105727,7 +106416,7 @@
     12:31:com.android.tools.r8.graph.DexMethodSignature internalGetAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState,boolean):422:441 -> a
     32:32:com.android.tools.r8.graph.DexMethodSignature getAndReserveNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):407:407 -> a
     1:1:com.android.tools.r8.graph.DexMethodSignature getNewMethodSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.optimize.proto.ProtoNormalizer$GlobalReservationState):399:399 -> b
-com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens -> com.android.tools.r8.internal.HR:
+com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens -> com.android.tools.r8.internal.bS:
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.collections.BidirectionalOneToOneMap newMethodSignatures -> f
     java.util.Map prototypeChanges -> g
@@ -105766,7 +106455,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):128:128 -> e
     1:1:boolean isContextFreeForMethods():92:92 -> g
-com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder -> com.android.tools.r8.internal.GR:
+com.android.tools.r8.optimize.proto.ProtoNormalizerGraphLens$Builder -> com.android.tools.r8.internal.aS:
     java.util.Map prototypeChanges -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> b
@@ -105829,7 +106518,7 @@
     178:178:void putAnnotations(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.AnnotationWriter,com.android.tools.r8.org.objectweb.asm.ByteVector):468:468 -> a
     179:202: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.f4:
+com.android.tools.r8.org.objectweb.asm.Attribute -> com.android.tools.r8.internal.h4:
     byte[] content -> b
     java.lang.String type -> a
     com.android.tools.r8.org.objectweb.asm.Attribute nextAttribute -> c
@@ -105838,7 +106527,7 @@
     4:4:com.android.tools.r8.org.objectweb.asm.ByteVector write(com.android.tools.r8.org.objectweb.asm.ClassWriter,byte[],int,int,int):159:159 -> a
     5:18:int computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,int,int):247:260 -> a
     19:29: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.e4:
+com.android.tools.r8.org.objectweb.asm.Attribute$Set -> com.android.tools.r8.internal.g4:
     com.android.tools.r8.org.objectweb.asm.Attribute[] data -> b
     int size -> a
     1:6:void <init>():351:356 -> <init>
@@ -105848,7 +106537,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.w6:
+com.android.tools.r8.org.objectweb.asm.ByteVector -> com.android.tools.r8.internal.y6:
     byte[] data -> a
     int length -> b
     1:2:void <init>():45:46 -> <init>
@@ -105868,7 +106557,7 @@
     1:9:com.android.tools.r8.org.objectweb.asm.ByteVector put12(int,int):130:138 -> c
     10:19: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.fb:
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.ib:
     int[] bootstrapMethodOffsets -> f
     byte[] classFileBuffer -> b
     int[] cpInfoOffsets -> c
@@ -106190,7 +106879,7 @@
     1:2:long readLong(int):3634:3635 -> e
     1:2:short readShort(int):3607:3608 -> f
     1:2:int readUnsignedShort(int):3595:3596 -> g
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.ob:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.rb:
     java.lang.String className -> b
     int constantPoolCount -> c
     1:1:void <init>(java.lang.String,int):0:0 -> <init>
@@ -106203,7 +106892,7 @@
     50:52: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.sb:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.vb:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):58:58 -> <init>
@@ -106229,7 +106918,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.Bb:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.Eb:
 # {"id":"sourceFile","fileName":"ClassWriter.java"}
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
@@ -106299,7 +106988,7 @@
     307:307:byte[] toByteArray():720:720 -> b
     308:308: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.Td:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.Wd:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -106314,7 +107003,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.Zd:
+com.android.tools.r8.org.objectweb.asm.Constants -> com.android.tools.r8.internal.ce:
 # {"id":"sourceFile","fileName":"Constants.java"}
     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
@@ -106326,7 +107015,7 @@
     24: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.te:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.we:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -106347,15 +107036,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.ye:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.Be:
     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.pi:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.ti:
     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.Uk:
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.Zk:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> b
     int api -> a
     1:1:void <init>(int):57:57 -> <init>
@@ -106373,7 +107062,7 @@
     8:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):117:117 -> a
     9:10:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):131:132 -> a
     11:12:void visitEnd():141:142 -> a
-com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.Vk:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.al:
     com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> m
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> i
     com.android.tools.r8.org.objectweb.asm.SymbolTable symbolTable -> c
@@ -106402,7 +107091,7 @@
     15:21:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):219:225 -> b
     15:21:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable):191 -> b
     15:21:int computeFieldInfoSize():208 -> b
-com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.Nl:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.Sl:
     short outputStackTop -> g
     short outputStackStart -> f
     int[] initializations -> i
@@ -106512,7 +107201,7 @@
     1:11:void setLocal(int,int):504:514 -> b
     12:27:void push(int):524:539 -> b
     28:32:int pop():567:571 -> b
-com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.Zm:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.en:
     boolean isInterface -> e
     java.lang.String name -> c
     java.lang.String owner -> b
@@ -106527,7 +107216,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.an:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.fn:
     com.android.tools.r8.org.objectweb.asm.Handler nextHandler -> f
     com.android.tools.r8.org.objectweb.asm.Label handlerPc -> c
     int catchType -> d
@@ -106547,7 +107236,7 @@
     26:27: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
     28:29: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
     28:29: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):148 -> a
-com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.iC:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.oC:
     com.android.tools.r8.org.objectweb.asm.Frame frame -> k
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> m
     int bytecodeOffset -> e
@@ -106584,7 +107273,7 @@
     623:623:java.lang.String toString():620:620 -> toString
     624:624:java.lang.String toString():620:620 -> toString
     621:621:java.lang.String toString():620:620 -> toString
-com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.PG:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.WG:
     int codeSize -> e
     java.lang.String methodName -> c
     java.lang.String className -> b
@@ -106594,7 +107283,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.QG:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.XG:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):71:71 -> <init>
@@ -106647,7 +107336,7 @@
     9:10:void visitMaxs(int,int):772:773 -> c
     11:12: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.RG:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.YG:
     boolean hasSubroutines -> d0
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> I
     int nameIndex -> l
@@ -106859,7 +107548,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.pH:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.wH:
     com.android.tools.r8.org.objectweb.asm.ModuleVisitor mv -> a
     1:1:void <init>(int):57:57 -> <init>
     2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):68:76 -> <init>
@@ -106879,7 +107568,7 @@
     1:2:void visitPackage(java.lang.String):102:103 -> b
     3:4:void visitOpen(java.lang.String,int,java.lang.String[]):146:147 -> b
     1:2:void visitUse(java.lang.String):158:159 -> c
-com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.qH:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.xH:
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> m
     int providesCount -> n
     com.android.tools.r8.org.objectweb.asm.ByteVector opens -> k
@@ -106909,7 +107598,7 @@
     13:23:int computeAttributesSize():196:206 -> b
     1:2:void visitUse(java.lang.String):160:161 -> c
     3:3:int getAttributeCount():186:186 -> c
-com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.HM:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.YM:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -106918,7 +107607,7 @@
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
     1:7:void <clinit>():392:398 -> <clinit>
-com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.vS:
+com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.QS:
     com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor delegate -> a
     1:1:void <init>(int):57:57 -> <init>
     2:10:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):68:76 -> <init>
@@ -106934,7 +107623,7 @@
     3:4:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):126:127 -> a
     5:6:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):138:139 -> a
     7:8:void visitEnd():148:149 -> a
-com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.wS:
+com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.RS:
     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
@@ -106961,7 +107650,7 @@
     10:16:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable,byte[],int,int,int):219:225 -> b
     10:16:int com.android.tools.r8.org.objectweb.asm.Attribute.computeAttributesSize(com.android.tools.r8.org.objectweb.asm.SymbolTable):191 -> b
     10:16:int computeRecordComponentInfoSize():169 -> b
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.q00:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.L00:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -107094,7 +107783,7 @@
     11:20:int com.android.tools.r8.org.objectweb.asm.SymbolTable.addTypeInternal(com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry):1216:1225 -> e
     11:20:int addType(java.lang.String):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.p00:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.K00:
     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
@@ -107119,7 +107808,7 @@
     33:39:void com.android.tools.r8.org.objectweb.asm.Symbol.<init>(int,int,java.lang.String,java.lang.String,java.lang.String,long):220:226 -> <init>
     33:39:void <init>(int,int,java.lang.String,long,int):1307 -> <init>
     40:40:void <init>(int,int,java.lang.String,long,int):1308:1308 -> <init>
-com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.S10:
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.o20:
     com.android.tools.r8.org.objectweb.asm.Type FLOAT_TYPE -> k
     com.android.tools.r8.org.objectweb.asm.Type INT_TYPE -> j
     com.android.tools.r8.org.objectweb.asm.Type DOUBLE_TYPE -> m
@@ -107179,7 +107868,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> f
     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.R20:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.n30:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -107196,7 +107885,7 @@
     7:7:java.lang.String toString():174:174 -> toString
     8:8:java.lang.String toString():171:171 -> toString
     9:24:java.lang.String toString():168:183 -> toString
-com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.S20:
+com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.o30:
     int targetTypeAndInfo -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:int getExceptionIndex():359:359 -> a
@@ -107207,7 +107896,7 @@
     1:1:int getTypeArgumentIndex():382:382 -> f
     1:1:int getTypeParameterBoundIndex():327:327 -> g
     1:1:int getTypeParameterIndex():315:315 -> h
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.Rw:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.Xw:
     java.util.BitSet mainSubroutineInsns -> F
     java.util.BitSet sharedSubroutineInsns -> H
     java.util.Map subroutinesInsns -> G
@@ -107333,7 +108022,7 @@
     142:144:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():315:317 -> c
     142:144:void visitEnd():155 -> c
     145:146:void visitEnd():157:158 -> c
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.Qw:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.Ww:
     java.util.Map clonedLabels -> d
     java.util.BitSet subroutineInsns -> c
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode returnLabel -> e
@@ -107351,7 +108040,7 @@
     2:2:com.android.tools.r8.org.objectweb.asm.tree.LabelNode com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation.get(java.lang.Object):558 -> get
     2:2:java.lang.Object get(java.lang.Object):427 -> get
     1:1:int hashCode():568:568 -> hashCode
-com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.internal.UW:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureReader -> com.android.tools.r8.internal.pX:
     java.lang.String signatureValue -> a
     1:2:void <init>(java.lang.String):49:50 -> <init>
     1:17:void accept(com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):64:80 -> a
@@ -107363,7 +108052,7 @@
     230:230:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):229:229 -> a
     231:241:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):196:206 -> a
     242:242:int parseType(java.lang.String,int,com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor):168:168 -> a
-com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor -> com.android.tools.r8.internal.VW:
+com.android.tools.r8.org.objectweb.asm.signature.SignatureVisitor -> com.android.tools.r8.internal.qX:
     1:1:void <init>(int):74:74 -> <init>
 com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode -> com.android.tools.r8.internal.y:
     java.util.List visibleTypeAnnotations -> b
@@ -107415,7 +108104,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.ClassNode -> com.android.tools.r8.internal.Ra:
+com.android.tools.r8.org.objectweb.asm.tree.ClassNode -> com.android.tools.r8.internal.Ua:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     java.util.List invisibleAnnotations -> d
@@ -107452,7 +108141,7 @@
     3:3:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):262 -> b
     4:4:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):263:263 -> b
     1:1:void visitPermittedSubclass(java.lang.String):249:249 -> c
-com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.vk:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.Ak:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -107460,7 +108149,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.FieldNode -> com.android.tools.r8.internal.Dk:
+com.android.tools.r8.org.objectweb.asm.tree.FieldNode -> com.android.tools.r8.internal.Ik:
     java.util.List visibleTypeAnnotations -> f
     java.util.List invisibleAnnotations -> e
     java.util.List visibleAnnotations -> d
@@ -107472,7 +108161,7 @@
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):144:148 -> a
     6:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):156:160 -> a
     11:11:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):167:167 -> a
-com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.Ol:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.Tl:
     int type -> g
     java.util.List stack -> i
     java.util.List local -> h
@@ -107491,16 +108180,16 @@
     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.Ko:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.Po:
     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.InnerClassNode -> com.android.tools.r8.internal.Fq:
+com.android.tools.r8.org.objectweb.asm.tree.InnerClassNode -> com.android.tools.r8.internal.Kq:
     1:1:void <init>(java.lang.String,java.lang.String,java.lang.String,int):70:70 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.Hq:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.Mq:
     int size -> b
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode lastInsn -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] cache -> e
@@ -107523,7 +108212,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.Gq:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.Lq:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode remove -> d
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> e
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode nextInsn -> b
@@ -107541,18 +108230,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.Iq:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.Nq:
     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.Du:
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.Ju:
     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.cw:
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.iw:
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
@@ -107561,7 +108250,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.zx:
+com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.Fx:
     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
@@ -107570,7 +108259,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.jC:
+com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.pC:
     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
@@ -107578,13 +108267,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.KC:
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.QC:
     java.lang.Object cst -> g
     1:2:void <init>(java.lang.Object):64:65 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):75:76 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):81:81 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.qD:
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.wD:
     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>
@@ -107594,14 +108283,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.kE:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.rE:
     java.util.List start -> f
     java.util.List index -> h
     java.util.List end -> 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.lE:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.sE:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -107609,7 +108298,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.TE:
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.aF:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -107623,7 +108312,7 @@
     14:16:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89 -> a
     17:19: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.qG:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.xG:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -107632,7 +108321,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.uG:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.BG:
     java.util.List attrs -> r
     java.util.List invisibleTypeAnnotations -> q
     com.android.tools.r8.org.objectweb.asm.tree.InsnList instructions -> x
@@ -107734,13 +108423,13 @@
     6:6:void visitTypeInsn(int,java.lang.String):358:358 -> c
     7:8: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.tG:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.AG:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> b
     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.ModuleExportNode -> com.android.tools.r8.internal.kH:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleExportNode -> com.android.tools.r8.internal.rH:
     1:1:void <init>(java.lang.String,int,java.util.List):64:64 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.ModuleNode -> com.android.tools.r8.internal.lH:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleNode -> com.android.tools.r8.internal.sH:
     java.util.List packages -> b
     java.util.List uses -> f
     java.util.List opens -> e
@@ -107756,24 +108445,24 @@
     1:4:void visitPackage(java.lang.String):140:143 -> b
     5:8:void visitOpen(java.lang.String,int,java.lang.String[]):164:167 -> b
     1:4:void visitUse(java.lang.String):172:175 -> c
-com.android.tools.r8.org.objectweb.asm.tree.ModuleOpenNode -> com.android.tools.r8.internal.mH:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleOpenNode -> com.android.tools.r8.internal.tH:
     1:1:void <init>(java.lang.String,int,java.util.List):64:64 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.ModuleProvideNode -> com.android.tools.r8.internal.nH:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleProvideNode -> com.android.tools.r8.internal.uH:
     1:1:void <init>(java.lang.String,java.util.List):53:53 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.ModuleRequireNode -> com.android.tools.r8.internal.oH:
+com.android.tools.r8.org.objectweb.asm.tree.ModuleRequireNode -> com.android.tools.r8.internal.vH:
     1:1:void <init>(java.lang.String,int,java.lang.String):59:59 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.zH:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.GH:
     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.DN:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.UN:
     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.RecordComponentNode -> com.android.tools.r8.internal.uS:
+com.android.tools.r8.org.objectweb.asm.tree.RecordComponentNode -> com.android.tools.r8.internal.PS:
     java.util.List visibleAnnotations -> b
     java.util.List attrs -> f
     java.util.List invisibleTypeAnnotations -> e
@@ -107784,7 +108473,7 @@
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):108:112 -> a
     6:10:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):120:124 -> a
     11:11:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):131:131 -> a
-com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.I00:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.e10:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -107799,7 +108488,7 @@
     10:12:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90 -> a
     13:14: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.P10:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.l20:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
@@ -107811,24 +108500,24 @@
     5:9:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):109:113 -> a
     10:19:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):112:121 -> a
     20:20:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):120:120 -> a
-com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.M20:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.i30:
     int typeRef -> d
     com.android.tools.r8.org.objectweb.asm.TypePath typePath -> e
     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.Q20:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.m30:
     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.U30:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.q40:
     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.l40:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.H40:
     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
@@ -107937,7 +108626,7 @@
     101:101:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):83:83 -> <init>
     90:90:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):83:83 -> <init>
     91:96:void <init>(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.lang.String,java.lang.Object,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value):82:87 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.tools.r8.internal.Q4:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue -> com.android.tools.r8.internal.S4:
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue FLOAT_VALUE -> d
     com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue INT_VALUE -> c
     com.android.tools.r8.org.objectweb.asm.Type type -> a
@@ -107953,7 +108642,7 @@
     1:5:boolean equals(java.lang.Object):101:105 -> equals
     1:1:int hashCode():114:114 -> hashCode
     1:8:java.lang.String toString():119:126 -> toString
-com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicVerifier -> com.android.tools.r8.internal.R4:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicVerifier -> com.android.tools.r8.internal.T4:
     com.android.tools.r8.org.objectweb.asm.Type com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.NULL_TYPE -> h
     1:1:void com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.<clinit>():56:56 -> <clinit>
     1:1:void com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.<init>(int):79:79 -> <init>
@@ -108162,7 +108851,7 @@
     589:589:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):231:231 -> b
     590:590:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):229:229 -> b
     591:591:com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicInterpreter.unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.BasicValue):225:225 -> b
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame -> com.android.tools.r8.internal.Ml:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame -> com.android.tools.r8.internal.Rl:
 # {"id":"sourceFile","fileName":"Frame.java"}
     int numStack -> d
     int maxStack -> e
@@ -108340,23 +109029,23 @@
     6:6:int com.android.tools.r8.org.objectweb.asm.tree.analysis.Frame.getStackSize():220:220 -> toString
     6:6:java.lang.String toString():747 -> toString
     7:9:java.lang.String toString():748:750 -> toString
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter -> com.android.tools.r8.internal.Nv:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Interpreter -> com.android.tools.r8.internal.Tv:
     1:1:void <init>(int):61:61 -> <init>
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value binaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value) -> a
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value copyOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value) -> a
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value naryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,java.util.List) -> a
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value newOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode) -> a
     com.android.tools.r8.org.objectweb.asm.tree.analysis.Value unaryOperation(com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode,com.android.tools.r8.org.objectweb.asm.tree.analysis.Value) -> b
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine -> com.android.tools.r8.internal.ZZ:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine -> com.android.tools.r8.internal.u00:
     java.util.List callers -> c
     boolean[] localsUsed -> b
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
     1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,int,com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode):61:65 -> <init>
     6:9:void <init>(com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):73:76 -> <init>
     1:11:boolean merge(com.android.tools.r8.org.objectweb.asm.tree.analysis.Subroutine):89:99 -> a
-com.android.tools.r8.org.objectweb.asm.tree.analysis.Value -> com.android.tools.r8.internal.Z30:
+com.android.tools.r8.org.objectweb.asm.tree.analysis.Value -> com.android.tools.r8.internal.v40:
 # {"id":"sourceFile","fileName":"Value.java"}
-com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.G9:
+com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter -> com.android.tools.r8.internal.J9:
     boolean useNamedValue -> b
     boolean visitEndCalled -> c
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,boolean):55:56 -> <init>
@@ -108396,7 +109085,7 @@
     53:53:void visitEnum(java.lang.String,java.lang.String,java.lang.String):96:96 -> a
     54:54:void com.android.tools.r8.org.objectweb.asm.util.CheckAnnotationAdapter.checkVisitEndNotCalled():132:132 -> a
     54:54:void visitEnum(java.lang.String,java.lang.String,java.lang.String):91 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.K9:
+com.android.tools.r8.org.objectweb.asm.util.CheckClassAdapter -> com.android.tools.r8.internal.N9:
     boolean visitNestHostCalled -> i
     java.lang.String nestMemberPackageName -> j
     boolean visitEndCalled -> k
@@ -108765,7 +109454,7 @@
     4:8:int checkSignatureIdentifier(java.lang.String,int):890:894 -> c
     1:3:void checkFieldSignature(java.lang.String):675:677 -> d
     1:13:java.lang.String getUnqualifiedName(java.lang.String):1127:1139 -> e
-com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.L9:
+com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter -> com.android.tools.r8.internal.O9:
     boolean visitEndCalled -> c
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):70:70 -> <init>
     1:1:void com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter.checkVisitEndNotCalled():113:113 -> a
@@ -108799,7 +109488,7 @@
     113:113:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):88:88 -> a
     114:114:void com.android.tools.r8.org.objectweb.asm.util.CheckFieldAdapter.checkVisitEndNotCalled() -> a
     114:114:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):84 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.O9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter -> com.android.tools.r8.internal.R9:
     boolean visitCodeCalled -> n
     java.util.Map labelInsnIndices -> r
     int visibleAnnotableParameterCount -> l
@@ -109218,7 +109907,7 @@
     4281:4281:void checkMethodDescriptor(int,java.lang.String):1408:1408 -> e
     1:2:void checkVisitMaxsNotCalled():1053:1054 -> f
     3:3:void checkUnsignedShort(int,java.lang.String):1133:1133 -> f
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.M9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1 -> com.android.tools.r8.internal.P9:
     com.android.tools.r8.org.objectweb.asm.MethodVisitor val$methodVisitor -> F
     1:1:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[],com.android.tools.r8.org.objectweb.asm.MethodVisitor):448:448 -> <init>
     1:15:void visitEnd():451:465 -> c
@@ -109227,7 +109916,7 @@
     21:22:void visitEnd():455:456 -> c
     23:27:void com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$1.throwError(com.android.tools.r8.org.objectweb.asm.tree.analysis.Analyzer,java.lang.Exception):470:474 -> c
     23:27:void visitEnd():460 -> c
-com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method -> com.android.tools.r8.internal.N9:
+com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method -> com.android.tools.r8.internal.Q9:
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_INT_INSN -> c
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_VAR_INSN -> d
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_TYPE_INSN -> e
@@ -109237,7 +109926,7 @@
     com.android.tools.r8.org.objectweb.asm.util.CheckMethodAdapter$Method VISIT_INSN -> b
     1:7:void <clinit>():73:79 -> <clinit>
     1:1:void <init>(java.lang.String,int):72:72 -> <init>
-com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter -> com.android.tools.r8.internal.Q9:
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter -> com.android.tools.r8.internal.T9:
     com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet requiredModules -> c
     boolean visitEndCalled -> i
     int classVersion -> h
@@ -109268,12 +109957,12 @@
     16:16:void visitOpen(java.lang.String,int,java.lang.String[]):149:149 -> b
     17:18:void checkVisitEndNotCalled():192:193 -> b
     1:4:void visitUse(java.lang.String):164:167 -> c
-com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet -> com.android.tools.r8.internal.P9:
+com.android.tools.r8.org.objectweb.asm.util.CheckModuleAdapter$NameSet -> com.android.tools.r8.internal.S9:
     java.util.HashSet names -> b
     java.lang.String type -> a
     1:3:void <init>(java.lang.String):202:204 -> <init>
     1:2:void checkNameNotAlreadyDeclared(java.lang.String):208:209 -> a
-com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter -> com.android.tools.r8.internal.T9:
+com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter -> com.android.tools.r8.internal.W9:
     boolean visitEndCalled -> b
     1:1:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):74:74 -> <init>
     1:1:void com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter.checkVisitEndNotCalled():117:117 -> a
@@ -109307,7 +109996,7 @@
     117:117:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):92:92 -> a
     118:118:void com.android.tools.r8.org.objectweb.asm.util.CheckRecordComponentAdapter.checkVisitEndNotCalled() -> a
     118:118:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):88 -> a
-com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.UO:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.mP:
     java.util.List text -> c
     java.lang.StringBuilder stringBuilder -> b
     java.lang.String[] TYPES -> e
@@ -109328,7 +110017,7 @@
     com.android.tools.r8.org.objectweb.asm.util.Printer visitTryCatchAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     1:23:void appendString(java.lang.StringBuilder,java.lang.String):1241:1263 -> a
     24:37:void appendString(java.lang.StringBuilder,java.lang.String):1253:1266 -> a
-com.android.tools.r8.org.objectweb.asm.util.Textifier -> com.android.tools.r8.internal.J00:
+com.android.tools.r8.org.objectweb.asm.util.Textifier -> com.android.tools.r8.internal.f10:
     java.lang.String tab2 -> g
     java.lang.String tab -> f
     java.lang.String ltab -> i
@@ -109464,7 +110153,7 @@
     16:16:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1587 -> b
     17:19:com.android.tools.r8.org.objectweb.asm.util.Textifier addNewTextifier(java.lang.String):1587:1589 -> b
     1:4:void visitAnnotationValue(java.lang.String):706:709 -> c
-com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.android.tools.r8.internal.o10:
+com.android.tools.r8.org.objectweb.asm.util.TraceAnnotationVisitor -> com.android.tools.r8.internal.K10:
     com.android.tools.r8.org.objectweb.asm.util.Printer printer -> b
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.org.objectweb.asm.util.Printer):60:61 -> <init>
     1:2:void visit(java.lang.String,java.lang.Object):66:67 -> a
@@ -109472,7 +110161,7 @@
     5:6:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,java.lang.String):78:79 -> a
     7:8:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):84:85 -> a
     9:10:void visitEnd():90:91 -> a
-com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor -> com.android.tools.r8.internal.p10:
+com.android.tools.r8.org.objectweb.asm.util.TraceMethodVisitor -> com.android.tools.r8.internal.L10:
     com.android.tools.r8.org.objectweb.asm.util.Printer p -> j
     1:2:void <init>(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.org.objectweb.asm.util.Printer):65:66 -> <init>
     1:3:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):77:79 -> a
@@ -109656,7 +110345,7 @@
     3:5:void com.android.tools.r8.org.objectweb.asm.util.Textifier.visitVarInsn(int,int):892:894 -> d
     3:5:void visitVarInsn(int,int):147 -> d
     6:6:void visitVarInsn(int,int):148:148 -> d
-com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.internal.s10:
+com.android.tools.r8.org.objectweb.asm.util.TraceSignatureVisitor -> com.android.tools.r8.internal.O10:
     int arrayStack -> j
     java.lang.String separator -> k
     int argumentStack -> i
@@ -110176,7 +110865,7 @@
     2:5:void <init>(com.android.tools.r8.graph.AppView):28:31 -> <init>
     1:57:com.android.tools.r8.naming.NamingLens compute(java.util.Map):37:93 -> a
     58:64:void lambda$compute$0(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):66:72 -> a
-    65:65:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    65:65:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     65:65:void lambda$compute$0(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):78 -> a
     66:67:void lambda$compute$0(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):82:83 -> a
     68:68:com.android.tools.r8.relocator.RelocatorDiagnostic com.android.tools.r8.relocator.RelocatorDiagnostic.typeRelocateAmbiguous(com.android.tools.r8.graph.DexType):36:36 -> a
@@ -110213,7 +110902,7 @@
     3:3:com.android.tools.r8.graph.DexString lookupInnerName(com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.utils.InternalOptions):122:122 -> a
     4:4:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexMethod):127:127 -> a
     5:5:com.android.tools.r8.graph.DexString lookupName(com.android.tools.r8.graph.DexField):132:132 -> a
-com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.RU:
+com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.mV:
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration repackagingConfiguration -> c
@@ -110223,7 +110912,7 @@
     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):76:78 -> a
     4:41:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):86:123 -> a
     42:42:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):130:130 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1297:1297 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1273:1273 -> a
     43:43:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):130 -> a
     44:48:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):134:138 -> a
     49:63: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.Map,java.util.Set):202:216 -> a
@@ -110244,7 +110933,7 @@
     117:117:boolean lambda$run$0(java.util.Map$Entry):142:142 -> a
     118:146: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):272:300 -> a
     147:147: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):298:298 -> a
-com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.MU:
+com.android.tools.r8.repackaging.Repackaging$1 -> com.android.tools.r8.internal.hV:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():87:87 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):87:87 -> <init>
@@ -110252,10 +110941,10 @@
     2:2:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):100:100 -> a
     3:3:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):105:105 -> a
     com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType) -> b
-com.android.tools.r8.repackaging.Repackaging$2 -> com.android.tools.r8.internal.NU:
+com.android.tools.r8.repackaging.Repackaging$2 -> com.android.tools.r8.internal.iV:
     1:1:void <init>(com.android.tools.r8.graph.AppView):109:109 -> <init>
     boolean isLegitimateToHaveEmptyMappings() -> m
-com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.OU:
+com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.jV:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.Minifier$MinificationPackageNamingStrategy packageMinificationStrategy -> e
@@ -110265,24 +110954,24 @@
     1:1:void <clinit>():328:328 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView):336:341 -> <init>
     1:5:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):346:350 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1305:1305 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1281:1281 -> a
     6:6:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):350 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1309:1309 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1285:1285 -> a
     7:7:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):352 -> a
     8:14:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):354:360 -> a
     15:20:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):357:362 -> a
-    21:21:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1301:1301 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1277:1277 -> a
     21:21:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):362 -> a
     22:28:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):362:368 -> a
     29:29:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):367:367 -> a
     30:34:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):373:377 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1305:1305 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1281:1281 -> a
     35:35:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):377 -> a
     36:36:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):378:378 -> a
-    37:37:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1309:1309 -> a
+    37:37:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1285:1285 -> a
     37:37:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):379 -> a
     38:42:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):381:385 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1301:1301 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1277:1277 -> a
     43:43:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):385 -> a
     44:44:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):385:385 -> a
     45:56: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):423:434 -> a
@@ -110296,8 +110985,8 @@
     496:500: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):444 -> a
     501:501: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):445:445 -> a
     1:13:boolean mayHavePinnedPackagePrivateOrProtectedItem(com.android.tools.r8.graph.ProgramPackage):396:408 -> b
-com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.PU:
-com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.QU:
+com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.kV:
+com.android.tools.r8.repackaging.Repackaging$RepackagingTreeFixer -> com.android.tools.r8.internal.lV:
     com.android.tools.r8.repackaging.RepackagingLens$Builder lensBuilder -> g
     com.android.tools.r8.com.google.common.collect.BiMap mappings -> f
     boolean $assertionsDisabled -> h
@@ -110322,7 +111011,7 @@
     9:9:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):100:100 -> a
     9:9:void recordClassChange(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):191 -> a
     1:1:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):176:176 -> b
-com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.SU:
+com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.nV:
     com.android.tools.r8.repackaging.RepackagingUseRegistry registry -> b
     com.android.tools.r8.graph.GraphLens graphLens -> a
     boolean $assertionsDisabled -> c
@@ -110351,7 +111040,7 @@
     118:118:void traceDexValue(com.android.tools.r8.graph.DexValue):93 -> a
     119:129:void traceDexValue(com.android.tools.r8.graph.DexValue):93:103 -> a
     130:130:void lambda$traceDexValue$0(com.android.tools.r8.graph.DexType):103:103 -> a
-com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.UU:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.pV:
     com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node libraryBoundaryNode -> e
     com.android.tools.r8.graph.ProgramPackage pkg -> b
     java.util.Map nodes -> c
@@ -110385,7 +111074,7 @@
     16:22:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node getNode(com.android.tools.r8.graph.DexDefinition):83:89 -> b
     23:23:void lambda$registerReferencesFromClass$1(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexType):117:117 -> b
     1:1:void lambda$registerReferencesFromMethod$3(com.android.tools.r8.repackaging.RepackagingUseRegistry,com.android.tools.r8.graph.DexType):156:156 -> c
-com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.TU:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.oV:
     com.android.tools.r8.graph.DexDefinition definitionForDebugging -> a
     java.util.Set neighbors -> b
     1:1:void <init>(com.android.tools.r8.graph.DexDefinition):203:203 -> <init>
@@ -110398,7 +111087,7 @@
     221:221:java.lang.String toString():218:218 -> toString
     222:222:java.lang.String toString():218:218 -> toString
     219:219:java.lang.String toString():218:218 -> toString
-com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.WU:
+com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.rV:
     com.android.tools.r8.com.google.common.collect.BiMap newTypes -> n
     boolean $assertionsDisabled -> p
     java.util.Map packageRenamings -> o
@@ -110411,14 +111100,14 @@
     13:13:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):70:70 -> a
     14:20:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):74:80 -> a
     21:21:boolean isSimpleTypeRenamingOrEqual(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexMember):77:77 -> a
-com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.VU:
+com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.qV:
     com.android.tools.r8.com.google.common.collect.BiMap newTypes -> a
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newFieldSignatures -> b
     com.android.tools.r8.utils.collections.MutableBidirectionalOneToOneMap newMethodSignatures -> c
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():83:83 -> <clinit>
     1:6:void <init>():83:88 -> <init>
-com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.XU:
+com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.sV:
     boolean $assertionsDisabled -> n
     com.android.tools.r8.graph.InitClassLens initClassLens -> i
     com.android.tools.r8.graph.GraphLens graphLens -> g
@@ -110443,11 +111132,11 @@
     43:49:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):164 -> a
     50:56:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):89:95 -> a
     50:56:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):164 -> a
-    57:57:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     57:57:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):96 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     57:57:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):164 -> a
-    58:58:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    58:58:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     58:58:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):96 -> a
     58:58:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):164 -> a
     59:62:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):96:99 -> a
@@ -110833,7 +111522,7 @@
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.retrace.StackTraceLineParser,com.android.tools.r8.retrace.StackTraceElementProxyRetracer,com.android.tools.r8.DiagnosticsHandler,boolean):32:32 -> <init>
     1:9:void lambda$retrace$0(java.util.List,java.util.List,int):85:93 -> a
-    10:15:int com.android.tools.r8.utils.StringUtils.firstNonWhitespaceCharacter(java.lang.String):338:343 -> a
+    10:15:int com.android.tools.r8.utils.StringUtils.firstNonWhitespaceCharacter(java.lang.String):346:351 -> a
     10:15:void lambda$retrace$0(java.util.List,java.util.List,int):93 -> a
     16:21:void lambda$retrace$0(java.util.List,java.util.List,int):93:98 -> a
     22:27:void lambda$retrace$0(java.util.List,java.util.List,int):95:100 -> a
@@ -110842,7 +111531,7 @@
     39:43:void lambda$joinAmbiguousLines$2(boolean,java.util.function.Consumer,java.lang.String):174:178 -> a
     44:49:void lambda$joinAmbiguousLines$2(boolean,java.util.function.Consumer,java.lang.String):175:180 -> a
     1:9:void lambda$retraceParsed$1(java.util.List,java.util.List,int):122:130 -> b
-    10:15:int com.android.tools.r8.utils.StringUtils.firstNonWhitespaceCharacter(java.lang.String):338:343 -> b
+    10:15:int com.android.tools.r8.utils.StringUtils.firstNonWhitespaceCharacter(java.lang.String):346:351 -> b
     10:15:void lambda$retraceParsed$1(java.util.List,java.util.List,int):130 -> b
     16:21:void lambda$retraceParsed$1(java.util.List,java.util.List,int):130:135 -> b
     22:27:void lambda$retraceParsed$1(java.util.List,java.util.List,int):132:137 -> b
@@ -110852,12 +111541,12 @@
     1:4:java.util.List retrace(java.util.List):79:82 -> retrace
     5:6:java.util.List retrace(java.lang.String):152:153 -> retrace
     1:4:java.util.List retraceParsed(java.util.List):116:119 -> retraceParsed
-com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.Df:
+com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.internal.Hf:
 # {"id":"sourceFile","fileName":"Definition.java"}
-com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.tk:
+com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.internal.yk:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.retrace.internal.FieldDefinition substituteHolder(com.android.tools.r8.references.ClassReference) -> a
-com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.rk:
+com.android.tools.r8.retrace.internal.FieldDefinition$BaseFieldDefinition -> com.android.tools.r8.internal.wk:
     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>
@@ -110869,7 +111558,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.sk:
+com.android.tools.r8.retrace.internal.FieldDefinition$FullFieldDefinition -> com.android.tools.r8.internal.xk:
     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>
@@ -110880,15 +111569,16 @@
     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.MappingProviderInternal -> com.android.tools.r8.internal.mF:
+com.android.tools.r8.retrace.internal.MappingProviderInternal -> com.android.tools.r8.internal.tF:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String) -> a
     java.util.Set getMapVersions() -> a
-com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.pG:
+    java.lang.String getSourceFileForClass(java.lang.String) -> b
+com.android.tools.r8.retrace.internal.MethodDefinition -> com.android.tools.r8.internal.wG:
     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
-com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.nG:
+com.android.tools.r8.retrace.internal.MethodDefinition$BaseMethodDefinition -> com.android.tools.r8.internal.uG:
     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>
@@ -110900,7 +111590,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.oG:
+com.android.tools.r8.retrace.internal.MethodDefinition$FullMethodDefinition -> com.android.tools.r8.internal.vG:
     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>
@@ -110914,7 +111604,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.ProguardMapReaderWithFiltering -> com.android.tools.r8.internal.LP:
+com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering -> com.android.tools.r8.internal.dQ:
     java.util.Set filter -> c
     boolean seenFirstClass -> e
     int endIndex -> b
@@ -110950,7 +111640,7 @@
     279:279:java.lang.String readLine():227:227 -> readLine
     280:280:java.lang.String com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering.getBufferAsString(byte[]):234:234 -> readLine
     280:280:java.lang.String readLine():228 -> readLine
-com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$LineParserState -> com.android.tools.r8.internal.IP:
+com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$LineParserState -> com.android.tools.r8.internal.aQ:
     com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$LineParserState IS_COMMENT_START -> h
     com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$LineParserState IS_COMMENT_SOURCE_FILE -> i
     com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$LineParserState NOT_CLASS_MAPPING_OR_SOURCE_FILE -> j
@@ -111045,7 +111735,7 @@
     69:70:com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$LineParserState com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$LineParserState.computeNextState():109:110 -> a
     69:70:com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$LineParserState computeState(byte[],int,int):66 -> a
     71:71:boolean read(char):161:161 -> a
-com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$ProguardMapReaderWithFilteringInputBuffer -> com.android.tools.r8.internal.JP:
+com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$ProguardMapReaderWithFilteringInputBuffer -> com.android.tools.r8.internal.bQ:
     int endIndex -> j
     int endReadIndex -> k
     int bufferIndex -> h
@@ -111060,7 +111750,7 @@
     1:1:void close():374:374 -> close
     1:11:byte[] read():379:389 -> d
     12:22:byte[] read():388:398 -> d
-com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$ProguardMapReaderWithFilteringMappedBuffer -> com.android.tools.r8.internal.KP:
+com.android.tools.r8.retrace.internal.ProguardMapReaderWithFiltering$ProguardMapReaderWithFilteringMappedBuffer -> com.android.tools.r8.internal.cQ:
     java.nio.MappedByteBuffer mappedByteBuffer -> g
     int currentPosition -> j
     int temporaryBufferPosition -> k
@@ -111079,7 +111769,7 @@
     10:15:byte[] read():316:321 -> d
     1:5:void readFromChannel():295:299 -> e
     6:6:void readFromChannel():296:296 -> e
-com.android.tools.r8.retrace.internal.ProguardMappingProviderBuilderImpl -> com.android.tools.r8.internal.SP:
+com.android.tools.r8.retrace.internal.ProguardMappingProviderBuilderImpl -> com.android.tools.r8.internal.kQ:
     java.util.Set allowedLookup -> c
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> e
     com.android.tools.r8.retrace.ProguardMapProducer proguardMapProducer -> a
@@ -111095,24 +111785,25 @@
     1:1:com.android.tools.r8.retrace.ProguardMappingProvider$Builder com.android.tools.r8.retrace.internal.ProguardMappingProviderBuilderImpl.setDiagnosticsHandler(com.android.tools.r8.DiagnosticsHandler):41:41 -> setDiagnosticsHandler
     1:1:com.android.tools.r8.retrace.MappingProviderBuilder setDiagnosticsHandler(com.android.tools.r8.DiagnosticsHandler):19 -> setDiagnosticsHandler
     1:1:com.android.tools.r8.retrace.ProguardMappingProvider$Builder setProguardMapProducer(com.android.tools.r8.retrace.ProguardMapProducer):60:60 -> setProguardMapProducer
-com.android.tools.r8.retrace.internal.ProguardMappingProviderBuilderImpl$1 -> com.android.tools.r8.internal.RP:
+com.android.tools.r8.retrace.internal.ProguardMappingProviderBuilderImpl$1 -> com.android.tools.r8.internal.jQ:
     1:1:void <init>(com.android.tools.r8.retrace.internal.ProguardMappingProviderBuilderImpl):25:25 -> <init>
-com.android.tools.r8.retrace.internal.ProguardMappingProviderImpl -> com.android.tools.r8.internal.TP:
+com.android.tools.r8.retrace.internal.ProguardMappingProviderImpl -> com.android.tools.r8.internal.lQ:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> a
     1:1:void <init>(com.android.tools.r8.naming.ClassNameMapper):24:24 -> <init>
     2:3:void <init>(com.android.tools.r8.naming.ClassNameMapper,java.util.Set):28:29 -> <init>
     1:1:java.util.Set getMapVersions():35:35 -> a
     2:2:com.android.tools.r8.naming.ClassNamingForNameMapper getClassNaming(java.lang.String):44:44 -> a
-com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.lV:
+    1:1:java.lang.String getSourceFileForClass(java.lang.String):49:49 -> b
+com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.GV:
     1:1:void <init>():7:7 -> <init>
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.oV:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.internal.JV:
     com.android.tools.r8.references.ClassReference obfuscatedReference -> a
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> c
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> b
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():30:30 -> <clinit>
     1:4:void <init>(com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.RetracerImpl):37:40 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper access$100(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):30:30 -> a
+    1:1:com.android.tools.r8.retrace.internal.RetracerImpl access$100(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):30:30 -> a
     2:2:com.android.tools.r8.retrace.internal.RetraceClassResultImpl create(com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper,com.android.tools.r8.retrace.internal.RetracerImpl):45:45 -> a
     3:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(java.lang.String):50:50 -> a
     4:4:com.android.tools.r8.retrace.internal.FieldDefinition com.android.tools.r8.retrace.internal.FieldDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> a
@@ -111148,7 +111839,7 @@
     53:53:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):141:141 -> a
     53:53:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl access$300(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):30 -> a
     54:54:com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl lookupThrownException(com.android.tools.r8.retrace.RetraceStackTraceContext):146:146 -> a
-    1:1:com.android.tools.r8.retrace.internal.RetracerImpl access$200(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):30:30 -> b
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper access$200(com.android.tools.r8.retrace.internal.RetraceClassResultImpl):30:30 -> b
     2:2:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(java.lang.String):61:61 -> b
     3:3:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> b
     3:3:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(java.lang.String):61 -> b
@@ -111179,9 +111870,9 @@
     7:7:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl.createElement():167:167 -> stream
     7:7:java.util.stream.Stream stream():157 -> stream
     8:8:java.util.stream.Stream stream():157:157 -> stream
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.mV:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.internal.HV:
     java.lang.Object create(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,java.lang.Object,com.android.tools.r8.retrace.internal.RetracerImpl) -> a
-com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.nV:
+com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl -> com.android.tools.r8.internal.IV:
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl classResult -> a
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
     com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl classReference -> b
@@ -111189,62 +111880,58 @@
     2:5:void <init>(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl,com.android.tools.r8.naming.ClassNamingForNameMapper):191:194 -> <init>
     1:1:com.android.tools.r8.naming.ClassNamingForNameMapper access$400(com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl):182:182 -> a
     2:2:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl getRetracedClass():199:199 -> a
-    3:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):239:239 -> a
-    4:14:java.lang.Object com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):273:283 -> a
-    4:14:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):239 -> a
-    15:15:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):239:239 -> a
-    16:17:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):242:243 -> a
-    18:18:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):257:257 -> a
-    19:29:java.lang.Object com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):273:283 -> a
-    19:29:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):257 -> a
-    30:30:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):257:257 -> a
-    1:5:java.util.List lambda$lookupMethod$1(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):260:264 -> b
-    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.getParentResult():218:218 -> getParentResult
+    3:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):230:230 -> a
+    4:14:java.lang.Object com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):264:274 -> a
+    4:14:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):230 -> a
+    15:15:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl lookupField(com.android.tools.r8.retrace.internal.FieldDefinition):230:230 -> a
+    16:17:java.util.List lambda$lookupField$0(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):233:234 -> a
+    18:18:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):248:248 -> a
+    19:29:java.lang.Object com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookup(com.android.tools.r8.retrace.internal.Definition,java.util.function.BiFunction,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor):264:274 -> a
+    19:29:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):248 -> a
+    30:30:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl lookupMethod(com.android.tools.r8.retrace.internal.MethodDefinition):248:248 -> a
+    1:5:java.util.List lambda$lookupMethod$1(com.android.tools.r8.naming.ClassNamingForNameMapper,java.lang.String):251:255 -> b
+    1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.getParentResult():209:209 -> getParentResult
     1:1:com.android.tools.r8.retrace.RetraceResult getParentResult():182 -> getParentResult
     1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.getRetracedClass():199:199 -> getRetracedClass
     1:1:com.android.tools.r8.retrace.RetracedClassReference getRetracedClass():182 -> getRetracedClass
-    1:3:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():205:207 -> getSourceFile
-    4:4:boolean com.android.tools.r8.naming.mappinginformation.MappingInformation.isFileNameInformation():0:0 -> getSourceFile
-    4:4:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():207 -> getSourceFile
-    5:10:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():208:213 -> getSourceFile
-    11:11:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.getRetracedClass():199:199 -> getSourceFile
-    11:11:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():213 -> getSourceFile
-    12:12:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():213:213 -> getSourceFile
-    1:3:com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult getUnknownJsonMappingInformation():318:318 -> getUnknownJsonMappingInformation
-    1:3:boolean isCompilerSynthesized():223:225 -> isCompilerSynthesized
-    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupField(java.lang.String):235:235 -> lookupField
+    1:1:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():204:204 -> getSourceFile
+    2:3:com.android.tools.r8.retrace.RetracedSourceFile com.android.tools.r8.retrace.internal.RetraceUtils.getSourceFile(com.android.tools.r8.retrace.RetracedClassReference,com.android.tools.r8.retrace.internal.RetracerImpl):76:77 -> getSourceFile
+    2:3:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():204 -> getSourceFile
+    1:3:com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult getUnknownJsonMappingInformation():309:309 -> getUnknownJsonMappingInformation
+    1:3:boolean isCompilerSynthesized():214:216 -> isCompilerSynthesized
+    1:1:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupField(java.lang.String):226:226 -> lookupField
     1:1:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):182 -> lookupField
     2:2:com.android.tools.r8.retrace.internal.FieldDefinition com.android.tools.r8.retrace.internal.FieldDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> lookupField
-    2:2:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupField(java.lang.String):235 -> lookupField
+    2:2:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupField(java.lang.String):226 -> lookupField
     2:2:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):182 -> lookupField
-    3:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupField(java.lang.String):235:235 -> lookupField
+    3:3:com.android.tools.r8.retrace.internal.RetraceFieldResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupField(java.lang.String):226:226 -> lookupField
     3:3:com.android.tools.r8.retrace.RetraceFieldResult lookupField(java.lang.String):182 -> lookupField
     1:1:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.MethodReference):20:20 -> lookupFrame
-    1:1:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.references.MethodReference):313 -> lookupFrame
-    2:2:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):324:324 -> lookupFrame
-    2:2:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.references.MethodReference):313 -> lookupFrame
-    3:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):289:292 -> lookupFrame
+    1:1:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.references.MethodReference):304 -> lookupFrame
+    2:2:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):315:315 -> lookupFrame
+    2:2:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.references.MethodReference):304 -> lookupFrame
+    3:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):280:283 -> lookupFrame
     3:6:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):182 -> lookupFrame
     7:7:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> lookupFrame
-    7:7:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):292 -> lookupFrame
+    7:7:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):283 -> lookupFrame
     7:7:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):182 -> lookupFrame
-    8:8:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):324:324 -> lookupFrame
-    8:8:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):289 -> lookupFrame
+    8:8:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):315:315 -> lookupFrame
+    8:8:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):280 -> lookupFrame
     8:8:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String):182 -> lookupFrame
-    9:14:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):302:307 -> lookupFrame
-    15:15:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):306:306 -> lookupFrame
+    9:14:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):293:298 -> lookupFrame
+    15:15:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):297:297 -> lookupFrame
     16:16:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.MethodReference):20:20 -> lookupFrame
-    16:16:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):305 -> lookupFrame
-    17:17:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):324:324 -> lookupFrame
-    17:17:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):302 -> lookupFrame
-    1:1:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupMethod(java.lang.String):253:253 -> lookupMethod
+    16:16:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):296 -> lookupFrame
+    17:17:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,com.android.tools.r8.retrace.internal.MethodDefinition):315:315 -> lookupFrame
+    17:17:com.android.tools.r8.retrace.RetraceFrameResult lookupFrame(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt,java.lang.String,java.util.List,com.android.tools.r8.references.TypeReference):293 -> lookupFrame
+    1:1:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupMethod(java.lang.String):244:244 -> lookupMethod
     1:1:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):182 -> lookupMethod
     2:2:com.android.tools.r8.retrace.internal.MethodDefinition com.android.tools.r8.retrace.internal.MethodDefinition.create(com.android.tools.r8.references.ClassReference,java.lang.String):16:16 -> lookupMethod
-    2:2:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupMethod(java.lang.String):253 -> lookupMethod
+    2:2:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupMethod(java.lang.String):244 -> lookupMethod
     2:2:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):182 -> lookupMethod
-    3:3:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupMethod(java.lang.String):253:253 -> lookupMethod
+    3:3:com.android.tools.r8.retrace.internal.RetraceMethodResultImpl com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl.lookupMethod(java.lang.String):244:244 -> lookupMethod
     3:3:com.android.tools.r8.retrace.RetraceMethodResult lookupMethod(java.lang.String):182 -> lookupMethod
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.qV:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl -> com.android.tools.r8.internal.LV:
     java.util.List memberNamings -> a
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> b
     com.android.tools.r8.retrace.Retracer retracer -> c
@@ -111268,7 +111955,7 @@
     1:8:boolean isAmbiguous():85:92 -> isAmbiguous
     1:1:boolean isEmpty():97:97 -> isEmpty
     1:2:java.util.stream.Stream stream():43:44 -> stream
-com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.pV:
+com.android.tools.r8.retrace.internal.RetraceFieldResultImpl$ElementImpl -> com.android.tools.r8.internal.KV:
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl fieldReference -> a
     com.android.tools.r8.retrace.internal.RetraceFieldResultImpl retraceFieldResult -> b
@@ -111283,7 +111970,7 @@
     1:1:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():142:142 -> getSourceFile
     1:1:boolean isCompilerSynthesized():117:117 -> isCompilerSynthesized
     1:1:boolean isUnknown():122:122 -> isUnknown
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.tV:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl -> com.android.tools.r8.internal.OV:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     com.android.tools.r8.utils.OptionalBool isAmbiguousCache -> f
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> d
@@ -111339,7 +112026,7 @@
     116:121:void lambda$separateAmbiguousOriginalPositions$4(java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.List):175 -> a
     122:122:void lambda$separateAmbiguousOriginalPositions$4(java.util.List,com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl,java.util.List):175:175 -> a
     123:126:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame,java.util.OptionalInt):198:201 -> a
-    127:130:int com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getFirstLineNumberOfOriginalRange():512:515 -> a
+    127:130:int com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange.getFirstLineNumberOfOriginalRange():524:527 -> a
     127:130:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame,java.util.OptionalInt):202 -> a
     131:131:java.util.OptionalInt com.android.tools.r8.utils.OptionalUtils.orElse(java.util.OptionalInt,int):13:13 -> a
     131:131:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl getRetracedMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame,java.util.OptionalInt):205 -> a
@@ -111367,7 +112054,7 @@
     20:34:boolean isAmbiguous():72:86 -> isAmbiguous
     1:1:boolean isEmpty():224:224 -> isEmpty
     1:2:java.util.stream.Stream stream():101:102 -> stream
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.rV:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl -> com.android.tools.r8.internal.MV:
     com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl methodReference -> a
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetraceFrameResultImpl retraceFrameResult -> b
@@ -111412,21 +112099,22 @@
     41:41:void forEachRewritten(java.util.function.Consumer):338:338 -> forEachRewritten
     1:1:com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getClassElement():285:285 -> getClassElement
     1:1:com.android.tools.r8.retrace.RetraceClassElement getClassElement():227 -> getClassElement
-    1:6:java.util.List getOuterFrames():357:362 -> getOuterFrames
-    7:8:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getMethodReferenceFromMappedRange(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):371:372 -> getOuterFrames
-    7:8:java.util.List getOuterFrames():362 -> getOuterFrames
-    9:12:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getMethodReferenceFromMappedRange(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):370:373 -> getOuterFrames
-    9:12:java.util.List getOuterFrames():362 -> getOuterFrames
-    13:13:java.util.List getOuterFrames():362:362 -> getOuterFrames
+    1:6:java.util.List getOuterFrames():356:361 -> getOuterFrames
+    7:8:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getMethodReferenceFromMappedRange(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):370:371 -> getOuterFrames
+    7:8:java.util.List getOuterFrames():361 -> getOuterFrames
+    9:12:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getMethodReferenceFromMappedRange(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):369:372 -> getOuterFrames
+    9:12:java.util.List getOuterFrames():361 -> getOuterFrames
+    13:13:java.util.List getOuterFrames():361:361 -> getOuterFrames
     1:1:com.android.tools.r8.retrace.RetraceFrameResult com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getParentResult():270:270 -> getParentResult
     1:1:com.android.tools.r8.retrace.RetraceResult getParentResult():227 -> getParentResult
-    1:4:com.android.tools.r8.retrace.RetraceStackTraceContext getRetraceStackTraceContext():379:382 -> getRetraceStackTraceContext
+    1:4:com.android.tools.r8.retrace.RetraceStackTraceContext getRetraceStackTraceContext():378:381 -> getRetraceStackTraceContext
     5:5:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl.builder():69:69 -> getRetraceStackTraceContext
-    5:5:com.android.tools.r8.retrace.RetraceStackTraceContext getRetraceStackTraceContext():385 -> getRetraceStackTraceContext
-    6:6:com.android.tools.r8.retrace.RetraceStackTraceContext getRetraceStackTraceContext():385:385 -> getRetraceStackTraceContext
-    7:7:com.android.tools.r8.retrace.RetraceStackTraceContext getRetraceStackTraceContext():383:383 -> getRetraceStackTraceContext
-    1:1:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile(com.android.tools.r8.retrace.RetracedClassMemberReference):352:352 -> getSourceFile
-    2:2:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile(com.android.tools.r8.retrace.RetracedClassMemberReference):351:351 -> getSourceFile
+    5:5:com.android.tools.r8.retrace.RetraceStackTraceContext getRetraceStackTraceContext():384 -> getRetraceStackTraceContext
+    6:6:com.android.tools.r8.retrace.RetraceStackTraceContext getRetraceStackTraceContext():384:384 -> getRetraceStackTraceContext
+    7:7:com.android.tools.r8.retrace.RetraceStackTraceContext getRetraceStackTraceContext():382:382 -> getRetraceStackTraceContext
+    1:1:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile(com.android.tools.r8.retrace.RetracedClassMemberReference):351:351 -> getSourceFile
+    2:3:com.android.tools.r8.retrace.RetracedSourceFile com.android.tools.r8.retrace.internal.RetraceUtils.getSourceFile(com.android.tools.r8.retrace.RetracedClassReference,com.android.tools.r8.retrace.internal.RetracerImpl):76:77 -> getSourceFile
+    2:3:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile(com.android.tools.r8.retrace.RetracedClassMemberReference):351 -> getSourceFile
     1:1:com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl.getTopFrame():280:280 -> getTopFrame
     1:1:com.android.tools.r8.retrace.RetracedMethodReference getTopFrame():227 -> getTopFrame
     1:1:boolean isCompilerSynthesized():265:265 -> isCompilerSynthesized
@@ -111435,30 +112123,30 @@
     1:1:boolean isUnknown():275:275 -> isUnknown
     1:3:java.util.stream.Stream stream():303:305 -> stream
     1:3:java.util.stream.Stream streamRewritten(com.android.tools.r8.retrace.RetraceStackTraceContext):344:346 -> streamRewritten
-com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame -> com.android.tools.r8.internal.sV:
+com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame -> com.android.tools.r8.internal.NV:
     com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange mappedRange -> a
     java.util.OptionalInt position -> b
-    1:3:void <init>(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):394:396 -> <init>
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange access$000(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):389:389 -> a
-    2:2:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):406:406 -> a
-    2:2:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$700(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):389 -> a
+    1:3:void <init>(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):393:395 -> <init>
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange access$000(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):388:388 -> a
+    2:2:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):405:405 -> a
+    2:2:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$700(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):388 -> a
     3:6:int com.android.tools.r8.naming.Range.span():53:56 -> a
-    3:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):406 -> a
-    3:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$700(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):389 -> a
-    7:7:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):408:408 -> a
-    7:7:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$700(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):389 -> a
-    8:8:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):407:407 -> a
-    8:8:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$700(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):389 -> a
-    9:9:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):412:412 -> a
-    9:9:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):404 -> a
-    9:9:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$700(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):389 -> a
-    10:10:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):412:412 -> a
-    10:10:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$600(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):389 -> a
-    1:1:java.util.OptionalInt access$100(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):389:389 -> b
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.getMappedRange():400:400 -> c
-    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange access$400(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):389 -> c
+    3:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):405 -> a
+    3:6:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$700(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):388 -> a
+    7:7:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):407:407 -> a
+    7:7:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$700(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):388 -> a
+    8:8:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):406:406 -> a
+    8:8:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$700(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):388 -> a
+    9:9:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):411:411 -> a
+    9:9:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):403 -> a
+    9:9:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$700(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange):388 -> a
+    10:10:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.create(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):411:411 -> a
+    10:10:com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame access$600(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,java.util.OptionalInt):388 -> a
+    1:1:java.util.OptionalInt access$100(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):388:388 -> b
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame.getMappedRange():399:399 -> c
+    1:1:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange access$400(com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$MappedRangeForFrame):388 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.vV:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl -> com.android.tools.r8.internal.QV:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> a
     java.util.List mappedRanges -> b
     com.android.tools.r8.retrace.internal.RetracerImpl retracer -> c
@@ -111495,7 +112183,7 @@
     1:1:boolean isEmpty():69:69 -> isEmpty
     1:1:com.android.tools.r8.retrace.RetraceFrameResult narrowByPosition(com.android.tools.r8.retrace.RetraceStackTraceContext,java.util.OptionalInt):27:27 -> narrowByPosition
     1:2:java.util.stream.Stream stream():128:129 -> stream
-com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.uV:
+com.android.tools.r8.retrace.internal.RetraceMethodResultImpl$ElementImpl -> com.android.tools.r8.internal.PV:
     com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl methodReference -> a
     com.android.tools.r8.retrace.internal.RetraceClassResultImpl$RetraceClassElementImpl classElement -> c
     com.android.tools.r8.retrace.internal.RetraceMethodResultImpl retraceMethodResult -> b
@@ -111507,9 +112195,11 @@
     1:1:com.android.tools.r8.retrace.RetraceResult getParentResult():158 -> getParentResult
     1:1:com.android.tools.r8.retrace.RetracedMethodReference getRetracedMethod():185:185 -> getRetracedMethod
     1:3:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():200:200 -> getSourceFile
+    4:5:com.android.tools.r8.retrace.RetracedSourceFile com.android.tools.r8.retrace.internal.RetraceUtils.getSourceFile(com.android.tools.r8.retrace.RetracedClassReference,com.android.tools.r8.retrace.internal.RetracerImpl):76:77 -> getSourceFile
+    4:5:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():200 -> getSourceFile
     1:1:boolean isCompilerSynthesized():175:175 -> isCompilerSynthesized
     1:1:boolean isUnknown():180:180 -> isUnknown
-com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl -> com.android.tools.r8.internal.xV:
+com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl -> com.android.tools.r8.internal.SV:
     com.android.tools.r8.references.ClassReference thrownException -> a
     java.util.OptionalInt rewritePosition -> b
     1:1:void <init>(com.android.tools.r8.references.ClassReference,java.util.OptionalInt,com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$1):16:16 -> <init>
@@ -111520,7 +112210,7 @@
     1:1:int getRewritePosition():56:56 -> b
     1:1:com.android.tools.r8.references.ClassReference getThrownException():28:28 -> c
     1:1:boolean hasRewritePosition():52:52 -> d
-com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder -> com.android.tools.r8.internal.wV:
+com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder -> com.android.tools.r8.internal.RV:
     com.android.tools.r8.references.ClassReference thrownException -> a
     java.util.OptionalInt rewritePosition -> b
     1:1:void <init>():81:81 -> <init>
@@ -111530,7 +112220,7 @@
     3:3:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl build():99:99 -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder clearRewritePosition():94:94 -> b
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl$Builder create():103:103 -> c
-com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation -> com.android.tools.r8.internal.zV:
+com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation -> com.android.tools.r8.internal.UV:
     com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation EMPTY -> b
     int removeInnerFramesCount -> a
     1:1:void <clinit>():9:9 -> <clinit>
@@ -111538,12 +112228,12 @@
     2:3:void <init>(int):14:15 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation empty():23:23 -> a
     1:1:int getRemoveInnerFramesCount():19:19 -> b
-com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder -> com.android.tools.r8.internal.yV:
+com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder -> com.android.tools.r8.internal.TV:
     int removeInnerFramesCount -> a
     1:1:void <init>():30:30 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation$Builder incrementRemoveInnerFramesCount(int):36:36 -> a
     2:2:com.android.tools.r8.retrace.internal.RetraceStackTraceCurrentEvaluationInformation build():50:50 -> a
-com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl -> com.android.tools.r8.internal.BV:
+com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl -> com.android.tools.r8.internal.WV:
     java.util.stream.Stream resultStream -> a
     java.util.function.Supplier resultContext -> b
     1:1:void <init>(java.util.stream.Stream,java.util.function.Supplier,com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$1):14:14 -> <init>
@@ -111556,13 +112246,13 @@
     4:4:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder builder():38 -> a
     1:1:com.android.tools.r8.retrace.RetraceStackTraceContext getResultContext():34:34 -> getResultContext
     1:1:java.util.stream.Stream stream():29:29 -> stream
-com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder -> com.android.tools.r8.internal.AV:
+com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder -> com.android.tools.r8.internal.VV:
     java.util.stream.Stream resultStream -> a
     java.util.function.Supplier resultContext -> b
     1:1:void <init>():46:46 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl build():60:60 -> a
     1:1:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder create():64:64 -> b
-com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl -> com.android.tools.r8.internal.DV:
+com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl -> com.android.tools.r8.internal.YV:
     com.android.tools.r8.references.ClassReference obfuscatedReference -> a
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> b
     1:4:void <init>(com.android.tools.r8.retrace.internal.RetraceStackTraceContextImpl,com.android.tools.r8.references.ClassReference,com.android.tools.r8.naming.ClassNamingForNameMapper):26:29 -> <init>
@@ -111572,7 +112262,7 @@
     7:7:com.android.tools.r8.retrace.RetraceThrownExceptionElement com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl.createElement():45:45 -> stream
     7:7:java.util.stream.Stream stream():34 -> stream
     8:8:java.util.stream.Stream stream():34:34 -> stream
-com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl -> com.android.tools.r8.internal.CV:
+com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl -> com.android.tools.r8.internal.XV:
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
     com.android.tools.r8.references.ClassReference thrownException -> d
     com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl classReference -> b
@@ -111593,7 +112283,7 @@
     11:11:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetraceThrownExceptionResultImpl$RetraceThrownExceptionElementImpl.getRetracedClass():73:73 -> getSourceFile
     11:11:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():92 -> getSourceFile
     12:12:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():92:92 -> getSourceFile
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.FV:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl -> com.android.tools.r8.internal.aW:
     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):19:21 -> <init>
@@ -111604,11 +112294,11 @@
     1:1:com.android.tools.r8.retrace.RetraceTypeResult forEach(java.util.function.Consumer):14 -> forEach
     1:13:java.util.stream.Stream stream():31:43 -> stream
     14:14:java.util.stream.Stream stream():32:32 -> stream
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.EV:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.ZV:
     com.android.tools.r8.retrace.RetracedTypeReference retracedType -> a
     1:2:void <init>(com.android.tools.r8.retrace.RetracedTypeReference):61:62 -> <init>
     1:1:com.android.tools.r8.retrace.RetracedTypeReference getType():67:67 -> getType
-com.android.tools.r8.retrace.internal.RetraceUnknownJsonMappingInformationResultImpl -> com.android.tools.r8.internal.GV:
+com.android.tools.r8.retrace.internal.RetraceUnknownJsonMappingInformationResultImpl -> com.android.tools.r8.internal.bW:
     java.util.List elements -> a
     1:2:void <init>(java.util.List):21:22 -> <init>
     1:1:com.android.tools.r8.retrace.RetraceUnknownMappingInformationElement lambda$stream$0(com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation):30:30 -> a
@@ -111618,62 +112308,60 @@
     11:11:void lambda$build$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.naming.mappinginformation.MappingInformation):39 -> a
     12:12:void lambda$build$1(com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.naming.mappinginformation.MappingInformation):40:40 -> a
     1:2:java.util.stream.Stream stream():27:28 -> stream
-com.android.tools.r8.retrace.internal.RetraceUnknownMappingInformationElementImpl -> com.android.tools.r8.internal.HV:
+com.android.tools.r8.retrace.internal.RetraceUnknownMappingInformationElementImpl -> com.android.tools.r8.internal.cW:
     com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation mappingInformation -> b
     com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult result -> a
     1:3:void <init>(com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult,com.android.tools.r8.naming.mappinginformation.UnknownJsonMappingInformation):19:21 -> <init>
     1:1:java.lang.String getIdentifier():26:26 -> getIdentifier
     1:1:java.lang.String getPayLoad():31:31 -> getPayLoad
     1:1:com.android.tools.r8.retrace.RetraceUnknownJsonMappingInformationResult getRetraceResultContext():36:36 -> getRetraceResultContext
-com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.IV:
+com.android.tools.r8.retrace.internal.RetraceUtils -> com.android.tools.r8.internal.dW:
     java.util.Set KEEP_SOURCEFILE_NAMES -> a
     boolean $assertionsDisabled -> b
-    1:3:void <clinit>():31:33 -> <clinit>
+    1:3:void <clinit>():27:29 -> <clinit>
     4:5:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Object[]):195:196 -> <clinit>
-    4:5:void <clinit>():33 -> <clinit>
-    6:6:void <clinit>():33:33 -> <clinit>
-    1:1:boolean hasPredictableSourceFileName(java.lang.String,java.lang.String):64:64 -> a
-    2:8:java.lang.String com.android.tools.r8.retrace.internal.RetraceUtils.getOuterClassSimpleName(java.lang.String):69:75 -> a
-    2:8:boolean hasPredictableSourceFileName(java.lang.String,java.lang.String):64 -> a
-    9:10:boolean hasPredictableSourceFileName(java.lang.String,java.lang.String):64:65 -> a
-    11:17:com.android.tools.r8.retrace.RetracedSourceFile getSourceFileOrLookup(com.android.tools.r8.retrace.RetracedClassReference,com.android.tools.r8.retrace.RetraceClassElement,com.android.tools.r8.retrace.Retracer):81:87 -> a
-    18:18:void lambda$getSourceFileOrLookup$0(com.android.tools.r8.utils.Box,com.android.tools.r8.retrace.RetraceClassElement):86:86 -> a
-    19:19:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):92:92 -> a
-    20:20:java.lang.String com.android.tools.r8.com.google.common.io.Files.getFileExtension(java.lang.String):803:803 -> a
-    20:20:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):95 -> a
-    21:21:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
-    21:21:java.lang.String com.android.tools.r8.com.google.common.io.Files.getFileExtension(java.lang.String):803 -> a
-    21:21:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):95 -> a
-    22:24:java.lang.String com.android.tools.r8.com.google.common.io.Files.getFileExtension(java.lang.String):804:806 -> a
-    22:24:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):95 -> a
-    25:31:java.lang.String com.android.tools.r8.retrace.internal.RetraceUtils.getOuterClassSimpleName(java.lang.String):69:75 -> a
-    25:31:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):96 -> a
-    32:32:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):97:97 -> a
-    33:33:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":233,"3":234}}
-    233:233:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):98:98 -> a
-    234:234:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):98:98 -> a
-    132:134:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):99:101 -> a
-    135:135:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":239,"2":240,"3":241,"4":242,"5":243,"6":244}}
-    239:239:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):103:103 -> a
-    240:240:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):103:103 -> a
-    241:241:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):103:103 -> a
-    242:242:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):103:103 -> a
-    243:243:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):103:103 -> a
-    244:244:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):103:103 -> a
-    245:249:com.android.tools.r8.references.MethodReference methodReferenceFromMappedRange(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.references.ClassReference):108:112 -> a
-    250:261:com.android.tools.r8.references.MethodReference methodReferenceFromMappedRange(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.references.ClassReference):111:122 -> a
-    262:262:com.android.tools.r8.references.MethodReference methodReferenceFromMappedRange(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.references.ClassReference):120:120 -> a
-    263:263:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):128:128 -> a
-    264:265:int com.android.tools.r8.retrace.internal.RetraceUtils.firstFromIndex(java.lang.String,int,java.util.function.Predicate):136:137 -> a
-    264:265:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):128 -> a
-    266:266:boolean com.android.tools.r8.com.google.common.base.Predicate.test(java.lang.Object):79:79 -> a
-    266:266:int com.android.tools.r8.retrace.internal.RetraceUtils.firstFromIndex(java.lang.String,int,java.util.function.Predicate):137 -> a
-    266:266:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):128 -> a
-    267:267:int com.android.tools.r8.retrace.internal.RetraceUtils.firstFromIndex(java.lang.String,int,java.util.function.Predicate):141:141 -> a
-    267:267:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):128 -> a
-com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.JV:
+    4:5:void <clinit>():29 -> <clinit>
+    6:6:void <clinit>():29:29 -> <clinit>
+    1:1:boolean hasPredictableSourceFileName(java.lang.String,java.lang.String):60:60 -> a
+    2:8:java.lang.String com.android.tools.r8.retrace.internal.RetraceUtils.getOuterClassSimpleName(java.lang.String):65:71 -> a
+    2:8:boolean hasPredictableSourceFileName(java.lang.String,java.lang.String):60 -> a
+    9:10:boolean hasPredictableSourceFileName(java.lang.String,java.lang.String):60:61 -> a
+    11:11:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):82:82 -> a
+    12:12:java.lang.String com.android.tools.r8.com.google.common.io.Files.getFileExtension(java.lang.String):803:803 -> a
+    12:12:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):85 -> a
+    13:13:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):880:880 -> a
+    13:13:java.lang.String com.android.tools.r8.com.google.common.io.Files.getFileExtension(java.lang.String):803 -> a
+    13:13:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):85 -> a
+    14:16:java.lang.String com.android.tools.r8.com.google.common.io.Files.getFileExtension(java.lang.String):804:806 -> a
+    14:16:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):85 -> a
+    17:23:java.lang.String com.android.tools.r8.retrace.internal.RetraceUtils.getOuterClassSimpleName(java.lang.String):65:71 -> a
+    17:23:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):86 -> a
+    24:24:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):87:87 -> a
+    25:25:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":205,"3":206}}
+    205:205:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):88:88 -> a
+    206:206:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):88:88 -> a
+    114:116:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):89:91 -> a
+    117:117:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":211,"2":212,"3":213,"4":214,"5":215,"6":216}}
+    211:211:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):93:93 -> a
+    212:212:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):93:93 -> a
+    213:213:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):93:93 -> a
+    214:214:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):93:93 -> a
+    215:215:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):93:93 -> a
+    216:216:java.lang.String inferSourceFile(java.lang.String,java.lang.String,boolean):93:93 -> a
+    217:221:com.android.tools.r8.references.MethodReference methodReferenceFromMappedRange(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.references.ClassReference):98:102 -> a
+    222:233:com.android.tools.r8.references.MethodReference methodReferenceFromMappedRange(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.references.ClassReference):101:112 -> a
+    234:234:com.android.tools.r8.references.MethodReference methodReferenceFromMappedRange(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.references.ClassReference):110:110 -> a
+    235:235:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):118:118 -> a
+    236:237:int com.android.tools.r8.retrace.internal.RetraceUtils.firstFromIndex(java.lang.String,int,java.util.function.Predicate):126:127 -> a
+    236:237:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):118 -> a
+    238:238:boolean com.android.tools.r8.com.google.common.base.Predicate.test(java.lang.Object):79:79 -> a
+    238:238:int com.android.tools.r8.retrace.internal.RetraceUtils.firstFromIndex(java.lang.String,int,java.util.function.Predicate):127 -> a
+    238:238:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):118 -> a
+    239:239:int com.android.tools.r8.retrace.internal.RetraceUtils.firstFromIndex(java.lang.String,int,java.util.function.Predicate):131:131 -> a
+    239:239:int firstNonWhiteSpaceCharacterFromIndex(java.lang.String,int):118 -> a
+com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl -> com.android.tools.r8.internal.eW:
     com.android.tools.r8.references.ClassReference classReference -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -111686,11 +112374,11 @@
     1:1:com.android.tools.r8.retrace.RetracedTypeReference getRetracedType():10 -> getRetracedType
     1:1:java.lang.String getTypeName():25:25 -> getTypeName
     1:1:int hashCode():56:56 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.MV:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl -> com.android.tools.r8.internal.hW:
     1:1:void <init>(com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1):12:12 -> <init>
     2:2:void <init>():14:14 -> <init>
     1:1:boolean isKnown():23:23 -> isKnown
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.KV:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.fW:
     com.android.tools.r8.references.FieldReference fieldReference -> b
     1:1:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1):31:31 -> <init>
     2:3:void <init>(com.android.tools.r8.references.FieldReference):36:37 -> <init>
@@ -111701,7 +112389,7 @@
     1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$KnownRetracedFieldReferenceImpl.getHolderClass():52:52 -> getHolderClass
     1:1:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():31 -> getHolderClass
     1:1:int hashCode():84:84 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.LV:
+com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl -> com.android.tools.r8.internal.gW:
     com.android.tools.r8.retrace.internal.FieldDefinition fieldDefinition -> b
     1:1:void <init>(com.android.tools.r8.retrace.internal.FieldDefinition,com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$1):88:88 -> <init>
     2:3:void <init>(com.android.tools.r8.retrace.internal.FieldDefinition):92:93 -> <init>
@@ -111710,7 +112398,7 @@
     1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetracedFieldReferenceImpl$UnknownRetracedFieldReferenceImpl.getHolderClass():98:98 -> getHolderClass
     1:1:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():88 -> getHolderClass
     1:1:int hashCode():120:120 -> hashCode
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android.tools.r8.internal.PV:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl -> com.android.tools.r8.internal.kW:
     java.util.Comparator comparator -> c
     int $r8$clinit -> d
     java.util.OptionalInt position -> b
@@ -111729,7 +112417,7 @@
     1:1:int getOriginalPositionOrDefault(int):50:50 -> getOriginalPositionOrDefault
     1:1:boolean hasPosition():45:45 -> hasPosition
     1:1:boolean isKnown():60:60 -> isKnown
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.NV:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$KnownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.iW:
     com.android.tools.r8.references.MethodReference methodReference -> e
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():73:73 -> <clinit>
@@ -111745,14 +112433,14 @@
     1:2:com.android.tools.r8.references.TypeReference getReturnType():112:113 -> getReturnType
     1:1:int hashCode():140:140 -> hashCode
     1:1:boolean isVoid():92:92 -> isVoid
-com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.OV:
+com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl -> com.android.tools.r8.internal.jW:
     com.android.tools.r8.retrace.internal.MethodDefinition methodDefinition -> e
     1:1:void <init>(com.android.tools.r8.retrace.internal.MethodDefinition,java.util.OptionalInt,com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$1):144:144 -> <init>
     2:3:void <init>(com.android.tools.r8.retrace.internal.MethodDefinition,java.util.OptionalInt):150:151 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetracedClassReferenceImpl com.android.tools.r8.retrace.internal.RetracedMethodReferenceImpl$UnknownRetracedMethodReferenceImpl.getHolderClass():156:156 -> getHolderClass
     1:1:com.android.tools.r8.retrace.RetracedClassReference getHolderClass():144 -> getHolderClass
     1:1:java.lang.String getMethodName():161:161 -> getMethodName
-com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl -> com.android.tools.r8.internal.QV:
+com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl -> com.android.tools.r8.internal.lW:
     com.android.tools.r8.retrace.RetracedMethodReference methodReference -> b
     com.android.tools.r8.retrace.internal.RetraceFrameResultImpl$ElementImpl frameElement -> a
     int index -> c
@@ -111764,7 +112452,7 @@
     2:2:com.android.tools.r8.retrace.RetracedMethodReference com.android.tools.r8.retrace.internal.RetracedSingleFrameImpl.getMethodReference():27:27 -> getSourceFile
     2:2:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():37 -> getSourceFile
     3:3:com.android.tools.r8.retrace.RetracedSourceFile getSourceFile():37:37 -> getSourceFile
-com.android.tools.r8.retrace.internal.RetracedSourceFileImpl -> com.android.tools.r8.internal.RV:
+com.android.tools.r8.retrace.internal.RetracedSourceFileImpl -> com.android.tools.r8.internal.mW:
     com.android.tools.r8.references.ClassReference classReference -> a
     java.lang.String filename -> b
     boolean $assertionsDisabled -> c
@@ -111775,7 +112463,7 @@
     2:2:java.lang.String getOrInferSourceFile():36:36 -> getOrInferSourceFile
     1:1:java.lang.String getSourceFile():28:28 -> getSourceFile
     1:1:boolean hasRetraceResult():23:23 -> hasRetraceResult
-com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.SV:
+com.android.tools.r8.retrace.internal.RetracedTypeReferenceImpl -> com.android.tools.r8.internal.nW:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.references.TypeReference typeReference -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -111788,14 +112476,15 @@
     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.VV:
+com.android.tools.r8.retrace.internal.RetracerImpl -> com.android.tools.r8.internal.qW:
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
     com.android.tools.r8.retrace.internal.MappingProviderInternal classNameMapperProvider -> a
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.retrace.internal.MappingProviderInternal,com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.retrace.internal.RetracerImpl$1):22:22 -> <init>
     2:5:void <init>(com.android.tools.r8.retrace.internal.MappingProviderInternal,com.android.tools.r8.DiagnosticsHandler):28:31 -> <init>
-    1:1:com.android.tools.r8.retrace.internal.RetracerImpl$Builder builder():91:91 -> a
+    1:1:java.lang.String getSourceFile(com.android.tools.r8.references.ClassReference):91:91 -> a
+    2:2:com.android.tools.r8.retrace.internal.RetracerImpl$Builder builder():95:95 -> a
     1:1:com.android.tools.r8.DiagnosticsHandler getDiagnosticsHandler():35:35 -> b
     1:1:java.util.Set getMapVersions():87:87 -> c
     1:3:com.android.tools.r8.retrace.internal.RetraceClassResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceClass(com.android.tools.r8.references.ClassReference):72:72 -> retraceClass
@@ -111829,23 +112518,23 @@
     4:4:com.android.tools.r8.retrace.RetraceThrownExceptionResult retraceThrownException(com.android.tools.r8.references.ClassReference):22 -> retraceThrownException
     1:1:com.android.tools.r8.retrace.internal.RetraceTypeResultImpl com.android.tools.r8.retrace.internal.RetracerImpl.retraceType(com.android.tools.r8.references.TypeReference):78:78 -> retraceType
     1:1:com.android.tools.r8.retrace.RetraceTypeResult retraceType(com.android.tools.r8.references.TypeReference):22 -> retraceType
-com.android.tools.r8.retrace.internal.RetracerImpl$Builder -> com.android.tools.r8.internal.UV:
+com.android.tools.r8.retrace.internal.RetracerImpl$Builder -> com.android.tools.r8.internal.pW:
     com.android.tools.r8.DiagnosticsHandler diagnosticsHandler -> b
     com.android.tools.r8.retrace.MappingProvider mappingProvider -> a
-    1:1:void <init>(com.android.tools.r8.retrace.internal.RetracerImpl$1):94:94 -> <init>
-    2:2:void <init>():99:99 -> <init>
-    3:3:void <init>():97:97 -> <init>
-    1:1:com.android.tools.r8.retrace.internal.RetracerImpl$Builder setMappingProvider(com.android.tools.r8.retrace.MappingProvider):103:103 -> a
-    2:2:com.android.tools.r8.retrace.internal.RetracerImpl$Builder setDiagnosticsHandler(com.android.tools.r8.DiagnosticsHandler):109:109 -> a
-    3:3:com.android.tools.r8.retrace.internal.RetracerImpl build():115:115 -> a
-    1:1:com.android.tools.r8.retrace.Retracer build():94:94 -> build
-    1:1:com.android.tools.r8.retrace.internal.RetracerImpl$Builder com.android.tools.r8.retrace.internal.RetracerImpl$Builder.setDiagnosticsHandler(com.android.tools.r8.DiagnosticsHandler):109:109 -> setDiagnosticsHandler
-    1:1:com.android.tools.r8.retrace.RetracerBuilder setDiagnosticsHandler(com.android.tools.r8.DiagnosticsHandler):94 -> setDiagnosticsHandler
-    1:1:com.android.tools.r8.retrace.internal.RetracerImpl$Builder com.android.tools.r8.retrace.internal.RetracerImpl$Builder.setMappingProvider(com.android.tools.r8.retrace.MappingProvider):103:103 -> setMappingProvider
-    1:1:com.android.tools.r8.retrace.RetracerBuilder setMappingProvider(com.android.tools.r8.retrace.MappingProvider):94 -> setMappingProvider
-com.android.tools.r8.retrace.internal.RetracerImpl$Builder$1 -> com.android.tools.r8.internal.TV:
-    1:1:void <init>(com.android.tools.r8.retrace.internal.RetracerImpl$Builder):97:97 -> <init>
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.eY:
+    1:1:void <init>(com.android.tools.r8.retrace.internal.RetracerImpl$1):98:98 -> <init>
+    2:2:void <init>():103:103 -> <init>
+    3:3:void <init>():101:101 -> <init>
+    1:1:com.android.tools.r8.retrace.internal.RetracerImpl$Builder setMappingProvider(com.android.tools.r8.retrace.MappingProvider):107:107 -> a
+    2:2:com.android.tools.r8.retrace.internal.RetracerImpl$Builder setDiagnosticsHandler(com.android.tools.r8.DiagnosticsHandler):113:113 -> a
+    3:3:com.android.tools.r8.retrace.internal.RetracerImpl build():119:119 -> a
+    1:1:com.android.tools.r8.retrace.Retracer build():98:98 -> build
+    1:1:com.android.tools.r8.retrace.internal.RetracerImpl$Builder com.android.tools.r8.retrace.internal.RetracerImpl$Builder.setDiagnosticsHandler(com.android.tools.r8.DiagnosticsHandler):113:113 -> setDiagnosticsHandler
+    1:1:com.android.tools.r8.retrace.RetracerBuilder setDiagnosticsHandler(com.android.tools.r8.DiagnosticsHandler):98 -> setDiagnosticsHandler
+    1:1:com.android.tools.r8.retrace.internal.RetracerImpl$Builder com.android.tools.r8.retrace.internal.RetracerImpl$Builder.setMappingProvider(com.android.tools.r8.retrace.MappingProvider):107:107 -> setMappingProvider
+    1:1:com.android.tools.r8.retrace.RetracerBuilder setMappingProvider(com.android.tools.r8.retrace.MappingProvider):98 -> setMappingProvider
+com.android.tools.r8.retrace.internal.RetracerImpl$Builder$1 -> com.android.tools.r8.internal.oW:
+    1:1:void <init>(com.android.tools.r8.retrace.internal.RetracerImpl$Builder):101:101 -> <init>
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl -> com.android.tools.r8.internal.zY:
     com.android.tools.r8.retrace.Retracer retracer -> a
     1:2:void <init>(com.android.tools.r8.retrace.Retracer):45:46 -> <init>
     1:4:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl retraceClassOrType(com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl,com.android.tools.r8.retrace.RetraceClassResult):81:84 -> a
@@ -111923,7 +112612,7 @@
     5:5:com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder com.android.tools.r8.retrace.internal.RetraceStackTraceElementProxyResultImpl$Builder.setResultContext(java.util.function.Supplier):55:55 -> retrace
     5:5:com.android.tools.r8.retrace.RetraceStackTraceElementProxyResult retrace(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceContext):55 -> retrace
     6:21:com.android.tools.r8.retrace.RetraceStackTraceElementProxyResult retrace(com.android.tools.r8.retrace.StackTraceElementProxy,com.android.tools.r8.retrace.RetraceStackTraceContext):56:71 -> retrace
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl -> com.android.tools.r8.internal.dY:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl -> com.android.tools.r8.internal.yY:
     boolean $assertionsDisabled -> m
     java.lang.String sourceFile -> h
     boolean isAmbiguous -> j
@@ -111978,7 +112667,7 @@
     1:1:boolean hasSourceFile():412:412 -> hasSourceFile
     1:1:boolean isAmbiguous():387:387 -> isAmbiguous
     1:1:boolean isTopFrame():392:392 -> isTopFrame
-com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder -> com.android.tools.r8.internal.cY:
+com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder -> com.android.tools.r8.internal.xY:
     java.lang.String sourceFile -> g
     com.android.tools.r8.retrace.RetracedMethodReference methodContext -> c
     java.util.List methodArguments -> f
@@ -112043,7 +112732,7 @@
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder.setTopFrame(boolean):602:602 -> d
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder access$300(com.android.tools.r8.retrace.internal.StackTraceElementProxyRetracerImpl$RetraceStackTraceElementProxyImpl$Builder,boolean):543 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.jY:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy -> com.android.tools.r8.internal.EY:
     java.util.List orderedIndices -> b
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldOrReturnType -> h
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodArguments -> i
@@ -112089,19 +112778,19 @@
     1:1:boolean hasSourceFile():73:73 -> hasSourceFile
     1:9:java.lang.String com.android.tools.r8.retrace.internal.StackTraceElementStringProxy.toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,boolean):146:154 -> toRetracedItem
     1:9:java.lang.Object toRetracedItem(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,boolean):23 -> toRetracedItem
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.fY:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.AY:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType TYPENAME -> c
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType BINARY -> b
     1:2:void <clinit>():167:168 -> <clinit>
     1:1:void <init>(java.lang.String,int):166:166 -> <init>
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.gY:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex -> com.android.tools.r8.internal.BY:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex NO_INDEX -> e
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType classNameType -> d
     1:1:void <clinit>():364:364 -> <clinit>
     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):362:362 -> <init>
     2:3:void <init>(int,int,com.android.tools.r8.utils.TriFunction,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType):379:380 -> <init>
     1:4:com.android.tools.r8.references.ClassReference getReference(java.lang.String):384:387 -> a
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.hY:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder -> com.android.tools.r8.internal.CY:
     java.util.List orderedIndices -> b
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex fieldOrReturnType -> h
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex methodArguments -> i
@@ -112137,13 +112826,13 @@
     1:12:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerMethodName(int,int):208:219 -> d
     13:17:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):213:217 -> d
     18:18:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):216:216 -> d
-    19:42:java.lang.String com.android.tools.r8.retrace.internal.RetraceUtils.methodDescriptionFromRetraceMethod(com.android.tools.r8.retrace.RetracedMethodReference,boolean,boolean):37:60 -> d
+    19:42:java.lang.String com.android.tools.r8.retrace.internal.RetraceUtils.methodDescriptionFromRetraceMethod(com.android.tools.r8.retrace.RetracedMethodReference,boolean,boolean):33:56 -> d
     19:42:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):216 -> d
-    43:43:java.lang.String com.android.tools.r8.retrace.internal.RetraceUtils.methodDescriptionFromRetraceMethod(com.android.tools.r8.retrace.RetracedMethodReference,boolean,boolean) -> d
+    43:43:java.lang.String com.android.tools.r8.retrace.internal.RetraceUtils.methodDescriptionFromRetraceMethod(com.android.tools.r8.retrace.RetracedMethodReference,boolean,boolean):39:39 -> d
     43:43:java.lang.String lambda$registerMethodName$1(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):216 -> d
     1:7:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder registerSourceFile(int,int):224:230 -> e
     8:8:java.lang.String lambda$registerSourceFile$2(com.android.tools.r8.retrace.RetraceStackTraceElementProxy,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy,java.lang.Boolean):229:229 -> e
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.iY:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex -> com.android.tools.r8.internal.DY:
     com.android.tools.r8.utils.TriFunction retracedString -> c
     int endIndex -> b
     int startIndex -> a
@@ -112151,7 +112840,7 @@
     2:5:void <init>(int,int,com.android.tools.r8.utils.TriFunction):351:354 -> <init>
     1:1:com.android.tools.r8.utils.TriFunction access$100(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):331:331 -> a
     2:2:boolean hasIndex():358:358 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.xY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser -> com.android.tools.r8.internal.SY:
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup lineNumberGroup -> g
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup fieldOrReturnTypeGroup -> h
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup methodNameGroup -> j
@@ -112190,60 +112879,60 @@
     49:72:int registerGroups(java.lang.String,java.lang.StringBuilder,java.util.List,int):88:111 -> a
     73:73:int registerGroups(java.lang.String,java.lang.StringBuilder,java.util.List,int):110:110 -> a
     1:1:com.android.tools.r8.retrace.StackTraceElementProxy parse(java.lang.Object):16:16 -> parse
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.kY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$BinaryNameGroup -> com.android.tools.r8.internal.FY:
     1:1:void <init>():222:222 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):222:222 -> <init>
     1:1:java.lang.String subExpression():226:226 -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType():231:231 -> b
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup -> com.android.tools.r8.internal.mY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup -> com.android.tools.r8.internal.HY:
     1:1:void <init>():179:179 -> <init>
     1:1:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):185:185 -> a
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType getClassNameType() -> b
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup$1 -> com.android.tools.r8.internal.lY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup$1 -> com.android.tools.r8.internal.GY:
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$ClassNameGroup this$0 -> b
     java.lang.String val$captureGroup -> a
     1:1:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$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.StackTraceRegularExpressionParser$FieldNameGroup -> com.android.tools.r8.internal.nY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldNameGroup -> com.android.tools.r8.internal.IY:
     1:1:void <init>():255:255 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):255:255 -> <init>
     1:1:java.lang.String subExpression():259:259 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):264:264 -> a
     3:7: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.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.oY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$FieldOrReturnTypeGroup -> com.android.tools.r8.internal.JY:
     1:1:void <init>():367:367 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):367:367 -> <init>
     1:1:java.lang.String subExpression():371:371 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):376:376 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):377:381 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.pY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$LineNumberGroup -> com.android.tools.r8.internal.KY:
     1:1:void <init>():302:302 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):302:302 -> <init>
     1:1:java.lang.String subExpression():306:306 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):311:311 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):312:316 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.qY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodArgumentsGroup -> com.android.tools.r8.internal.LY:
     1:1:void <init>():387:387 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):387:387 -> <init>
     1:1:java.lang.String subExpression():391:391 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):396:396 -> a
     3:7:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):397:401 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.rY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$MethodNameGroup -> com.android.tools.r8.internal.MY:
     1:1:void <init>():235:235 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):235:235 -> <init>
     1:1:java.lang.String subExpression():239:239 -> a
     2:2:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):244:244 -> a
     3:7: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.StackTraceRegularExpressionParser$RegularExpressionGroup -> com.android.tools.r8.internal.sY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroup -> com.android.tools.r8.internal.NY:
     1:1:void <init>():161:161 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):161:161 -> <init>
     com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String) -> a
     java.lang.String subExpression() -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler -> com.android.tools.r8.internal.tY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler -> com.android.tools.r8.internal.OY:
     boolean isClassHandler() -> a
     boolean matchHandler(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher) -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup -> com.android.tools.r8.internal.uY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileGroup -> com.android.tools.r8.internal.PY:
     1:1:void <init>():275:275 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):275:275 -> <init>
     1:1:java.lang.String subExpression():0:0 -> a
@@ -112264,7 +112953,7 @@
     2:2:java.lang.String subExpression():286 -> a
     9:9:com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$RegularExpressionGroupHandler createHandler(java.lang.String):291:291 -> a
     10:14:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):292:296 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.vY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$SourceFileLineNumberGroup -> com.android.tools.r8.internal.QY:
     1:1:void <init>():322:322 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):322:322 -> <init>
     1:1:java.lang.String subExpression():326:326 -> a
@@ -112295,7 +112984,7 @@
     20:32:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):336 -> a
     33:37:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):338:342 -> a
     38:38:boolean lambda$createHandler$0(java.lang.String,com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StackTraceElementStringProxyBuilder,java.util.regex.Matcher):341:341 -> a
-com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.wY:
+com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$TypeNameGroup -> com.android.tools.r8.internal.RY:
     1:1:void <init>():209:209 -> <init>
     2:2:void <init>(com.android.tools.r8.retrace.internal.StackTraceRegularExpressionParser$1):209:209 -> <init>
     1:1:java.lang.String subExpression():213:213 -> a
@@ -112428,30 +113117,30 @@
     16:16:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):88 -> a
     17:22:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):92:97 -> a
     23:25:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):96:98 -> a
-    26:26:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):363:363 -> a
+    26:26:boolean com.android.tools.r8.graph.DexAnnotation.isThrowingAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):390:390 -> a
     26:26:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):98 -> a
-    27:27:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):384:384 -> a
+    27:27:boolean com.android.tools.r8.graph.DexAnnotation.isSourceDebugExtension(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):411:411 -> a
     27:27:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):101 -> a
     28:30:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):102:104 -> a
     31:35:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):103:107 -> a
-    36:36:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):389:389 -> a
+    36:36:boolean com.android.tools.r8.graph.DexAnnotation.isParameterNameAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):416:416 -> a
     36:36:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):108 -> a
-    37:37:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):374:374 -> a
+    37:37:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):401:401 -> a
     37:37:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):111 -> a
     38:38:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):158:158 -> a
     39:40:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):122:123 -> a
-    41:41:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    41:41:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     41:41:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):123 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    42:42:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    42:42:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     42:42:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):123 -> a
-    43:43:boolean com.android.tools.r8.graph.DexAnnotation.isJavaLangRetentionAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):379:379 -> a
+    43:43:boolean com.android.tools.r8.graph.DexAnnotation.isJavaLangRetentionAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):406:406 -> a
     43:43:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):124 -> a
     44:44:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):128:128 -> a
     45:45:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():48:48 -> a
     45:45:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):128 -> a
     46:60:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):129:143 -> a
-    61:61:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    61:61:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     61:61:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):143 -> a
     62:62:boolean shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,boolean,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):146:146 -> a
     63:63:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():48:48 -> a
@@ -112528,19 +113217,19 @@
     390:390:com.android.tools.r8.graph.DexAnnotationElement lambda$rewriteEncodedAnnotation$3(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):253:253 -> a
     391:391:boolean lambda$rewriteAnnotationElement$4(com.android.tools.r8.graph.DexAnnotationElement,com.android.tools.r8.graph.DexEncodedMethod):281:281 -> a
     392:394:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):286:288 -> a
-    395:395:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    395:395:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     395:395:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):288 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    396:396:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    396:396:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     396:396:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):288 -> a
     397:410:void removeAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfo):289:302 -> a
     411:411:com.android.tools.r8.graph.DexAnnotation lambda$removeAnnotations$5(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):293:293 -> a
     412:412:com.android.tools.r8.graph.DexAnnotation lambda$removeAnnotations$7(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):303:303 -> a
     413:413:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):308:308 -> a
-    414:414:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):374:374 -> a
+    414:414:boolean com.android.tools.r8.graph.DexAnnotation.isAnnotationDefaultAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):401:401 -> a
     414:414:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):308 -> a
     415:415:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):311:311 -> a
-    416:416:boolean com.android.tools.r8.graph.DexAnnotation.isJavaLangRetentionAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):379:379 -> a
+    416:416:boolean com.android.tools.r8.graph.DexAnnotation.isJavaLangRetentionAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexItemFactory):406:406 -> a
     416:416:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):311 -> a
     417:425:boolean shouldRetainRetentionAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):327:335 -> a
     417:425:boolean shouldRetainAnnotationOnAnnotationClass(com.android.tools.r8.graph.DexAnnotation):312 -> a
@@ -112554,7 +113243,7 @@
     441:441:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):350:350 -> a
     442:442:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):196:196 -> a
     442:442:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):350 -> a
-    443:443:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():685:685 -> a
+    443:443:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():690:690 -> a
     443:443:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):199 -> a
     443:443:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):350 -> a
     444:444:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):202:202 -> a
@@ -112571,7 +113260,7 @@
     457:458:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):373:374 -> a
     459:459:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):215:215 -> a
     459:459:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):374 -> a
-    460:460:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():685:685 -> a
+    460:460:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():690:690 -> a
     460:460:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):218 -> a
     460:460:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):374 -> a
     461:461:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):223:223 -> a
@@ -112631,516 +113320,519 @@
     2:2:com.android.tools.r8.shaking.AnnotationRemover build(com.android.tools.r8.graph.AppView,java.util.Set):432:432 -> a
     1:1:void retainAnnotation(com.android.tools.r8.graph.DexAnnotation):427:427 -> b
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.h:
-    java.util.Map switchMaps -> R
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> P
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> N
     java.util.Set liveMethods -> s
+    java.util.Map switchMaps -> P
     java.util.Map mayHaveSideEffects -> y
+    java.util.Set neverInlineDueToSingleCaller -> A
     java.util.Map callSites -> w
-    java.util.Set neverClassInline -> H
-    java.util.Set noHorizontalClassMerging -> J
-    java.util.Set whyAreYouNotInlining -> D
+    java.util.Set noHorizontalClassMerging -> H
+    java.util.Set lockCandidates -> J
+    java.util.Set neverReprocess -> D
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl objectAllocationInfoCollection -> v
-    java.util.Set neverReprocess -> F
+    java.util.Set neverClassInline -> F
     java.util.Set failedMethodResolutionTargets -> o
     java.util.Set bootstrapMethods -> q
-    com.android.tools.r8.cf.CfVersion largestInputCfVersion -> T
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> x
-    java.util.Set lockCandidates -> L
+    java.util.Set recordFieldValuesReferences -> L
     java.util.Set liveTypes -> m
-    java.util.Set recordFieldValuesReferences -> N
-    java.util.Map initClassReferences -> M
-    com.android.tools.r8.shaking.SingleTargetLookupCache singleTargetLookupCache -> S
-    boolean $assertionsDisabled -> U
-    java.util.Map noSideEffects -> z
-    java.util.Set alwaysInline -> B
+    java.util.Set alwaysInline -> z
+    com.android.tools.r8.cf.CfVersion largestInputCfVersion -> R
+    com.android.tools.r8.shaking.SingleTargetLookupCache singleTargetLookupCache -> Q
+    java.util.Set whyAreYouNotInlining -> B
     com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> t
-    java.util.Map assumedValues -> A
-    java.util.Set noClassMerging -> I
+    boolean $assertionsDisabled -> S
+    java.util.Set noClassMerging -> G
+    java.util.Set noVerticalClassMerging -> I
     com.android.tools.r8.graph.MethodAccessInfoCollection methodAccessInfoCollection -> u
-    java.util.Set neverInlineDueToSingleCaller -> C
-    java.util.Set reprocess -> E
-    java.util.Set neverPropagateValue -> O
+    java.util.Set reprocess -> C
+    java.util.Set prunedTypes -> O
     java.util.Set failedFieldResolutionTargets -> p
-    java.util.Set prunedTypes -> Q
+    com.android.tools.r8.utils.PredicateSet alwaysClassInline -> E
+    java.util.Map initClassReferences -> K
     java.util.Set virtualMethodsTargetedByInvokeDirect -> r
-    java.util.Set noVerticalClassMerging -> K
     java.util.Set deadProtoTypes -> l
+    java.util.Set neverPropagateValue -> M
     java.util.Set targetedMethods -> n
-    com.android.tools.r8.utils.PredicateSet alwaysClassInline -> G
-    1:1:void <clinit>():92:92 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses,com.android.tools.r8.experimental.startup.StartupOrder,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,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,java.util.Set):244:244 -> <init>
-    2:475:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses,com.android.tools.r8.experimental.startup.StartupOrder,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,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,java.util.Set):202:675 -> <init>
-    476:509:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses,com.android.tools.r8.experimental.startup.StartupOrder,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,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,java.util.Set):245:278 -> <init>
-    510:514:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):615:619 -> <init>
-    515:515:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):614:614 -> <init>
-    516:989:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):202:675 -> <init>
-    990:1024:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):620:654 -> <init>
-    1:1:com.android.tools.r8.graph.ObjectAllocationInfoCollection getObjectAllocationInfoCollection():915:915 -> A
-    1:2:java.util.Set getPrunedTypes():1299:1300 -> B
-    1:1:java.util.Set getReprocessMethods():799:799 -> C
-    1:1:java.util.Set getVirtualMethodsTargetedByInvokeDirect():750:750 -> D
-    1:1:boolean hasNoAlwaysInlineMethods():758:758 -> E
-    1:1:boolean hasNoWhyAreYouNotInliningMethods():790:790 -> F
-    1:1:com.android.tools.r8.shaking.AppInfoWithLivenessModifier modifier():658:658 -> G
-    1:3:boolean verify():526:528 -> H
-    4:4:boolean verify():527:527 -> H
-    1:2:boolean verifyNoIteratingOverPrunedClasses():1577:1578 -> I
-    com.android.tools.r8.ir.analysis.type.DynamicType lambda$lookupSingleVirtualTarget$21(com.android.tools.r8.ir.analysis.type.DynamicType) -> a
-    1:1:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):92:92 -> a
-    2:2:com.android.tools.r8.graph.AppInfo rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):92:92 -> a
-    3:5:java.util.Set pruneMembers(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):393:395 -> a
-    6:6:java.util.Set pruneMembers(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):394:394 -> a
-    7:17:void lambda$pruneMembers$1(com.android.tools.r8.graph.PrunedItems,java.util.Set):397:407 -> a
-    18:21:java.util.Set pruneItems(java.util.Set,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):425:428 -> a
-    22:22:java.util.Set pruneItems(java.util.Set,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):427:427 -> a
-    23:26:void lambda$pruneItems$2(java.util.Set,java.util.Set):430:433 -> a
-    27:29:java.util.Map pruneMapFromMembers(java.util.Map,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):454:456 -> a
-    30:30:java.util.Map pruneMapFromMembers(java.util.Map,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):455:455 -> a
-    31:42:void lambda$pruneMapFromMembers$4(com.android.tools.r8.graph.PrunedItems,java.util.Map):458:469 -> a
-    43:45:boolean lambda$pruneMapFromMembers$3(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember):464:466 -> a
-    46:48:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):482:484 -> a
-    49:49:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):483:483 -> a
-    50:61:void lambda$pruneMapFromMembers$6(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):486:497 -> a
-    62:64:java.util.Map pruneMap(java.util.Map,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):510:512 -> a
-    65:65:java.util.Map pruneMap(java.util.Map,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):511:511 -> a
-    66:69:void lambda$pruneMap$7(java.util.Map,java.util.Set):514:517 -> a
-    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    70:70:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):678 -> a
+    1:1:void <clinit>():91:91 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses,com.android.tools.r8.experimental.startup.StartupOrder,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.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,java.util.Set):237:237 -> <init>
+    2:463:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses,com.android.tools.r8.experimental.startup.StartupOrder,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.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,java.util.Set):197:658 -> <init>
+    464:495:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexInfo,com.android.tools.r8.shaking.MissingClasses,com.android.tools.r8.experimental.startup.StartupOrder,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.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,java.util.Set):238:269 -> <init>
+    496:500:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):600:604 -> <init>
+    501:501:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):599:599 -> <init>
+    502:963:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):197:658 -> <init>
+    964:996:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map):605:637 -> <init>
+    1:1:com.android.tools.r8.graph.ObjectAllocationInfoCollection getObjectAllocationInfoCollection():878:878 -> A
+    1:2:java.util.Set getPrunedTypes():1254:1255 -> B
+    1:1:java.util.Set getReprocessMethods():762:762 -> C
+    1:1:java.util.Set getVirtualMethodsTargetedByInvokeDirect():733:733 -> D
+    1:1:boolean hasNoAlwaysInlineMethods():741:741 -> E
+    1:1:boolean hasNoWhyAreYouNotInliningMethods():753:753 -> F
+    1:1:com.android.tools.r8.shaking.AppInfoWithLivenessModifier modifier():641:641 -> G
+    1:3:boolean verify():513:515 -> H
+    4:4:boolean verify():514:514 -> H
+    1:2:boolean verifyNoIteratingOverPrunedClasses():1532:1533 -> I
+    com.android.tools.r8.ir.analysis.type.DynamicType lambda$lookupSingleVirtualTarget$19(com.android.tools.r8.ir.analysis.type.DynamicType) -> a
+    1:1:boolean com.android.tools.r8.graph.PrunedItems.hasRemovedMembers():91:91 -> a
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):469 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    71:71:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    71:71:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):678 -> a
-    72:73:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):681:682 -> a
-    74:85:void computeLargestCfVersion():688:688 -> a
-    74:85:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):682 -> a
-    95:95:void computeLargestCfVersion():698:698 -> a
-    95:95:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):682 -> a
-    96:96:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):684:684 -> a
-    97:100:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):577:580 -> a
-    101:101:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):578:578 -> a
-    102:103:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):582:583 -> a
-    104:104:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    104:104:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):583 -> a
-    105:124:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):585:604 -> a
-    125:125:boolean isBootstrapMethod(com.android.tools.r8.graph.ProgramMethod):746:746 -> a
-    126:126:boolean isBootstrapMethod(com.android.tools.r8.graph.DexMethod):742:742 -> a
-    126:126:boolean isBootstrapMethod(com.android.tools.r8.graph.ProgramMethod):746 -> a
-    127:142:void forEachReachableInterface(java.util.function.Consumer,java.lang.Iterable):808:823 -> a
-    143:176:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):842:875 -> a
-    177:177:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):845:845 -> a
-    178:178:void removeFromSingleTargetLookupCache(com.android.tools.r8.graph.DexClass):924:924 -> a
-    179:180:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):959:960 -> a
-    181:181:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():901:901 -> a
-    181:181:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):961 -> a
-    182:182:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
-    182:182:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):961 -> a
+    2:2:boolean com.android.tools.r8.graph.PrunedItems.hasRemovedMembers():91:91 -> a
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):469 -> a
+    3:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap pruneMapFromMembers(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):470:470 -> a
+    6:6:boolean com.android.tools.r8.graph.PrunedItems.hasRemovedMembers():91:91 -> a
+    6:6:java.util.Set pruneMembers(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):380 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    183:186:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):962:965 -> a
-    187:188:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1082:1083 -> a
-    187:188:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):969 -> a
-    189:189:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    189:189:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1083 -> a
-    189:189:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):969 -> a
-    190:191:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):991:992 -> a
-    192:192:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1189,"2":1190,"3":1191}}
-    1189:1189:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):992:992 -> a
-    1190:1190:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):992:992 -> a
-    1191:1191:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):992:992 -> a
-    1184:1188:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):992:996 -> a
-    1192:1195:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMember):1050:1053 -> a
-    1196:1196:java.lang.Boolean lambda$mayPropagateValueFor$10(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):1054:1054 -> a
-    1197:1197:java.lang.Boolean lambda$mayPropagateValueFor$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1055:1055 -> a
-    1198:1198:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):1104:1104 -> a
-    1199:1199:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1108:1108 -> a
-    1200:1200:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():670:670 -> a
-    1200:1200:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1108 -> a
+    7:7:boolean com.android.tools.r8.graph.PrunedItems.hasRemovedMembers():91:91 -> a
+    7:7:java.util.Set pruneMembers(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):380 -> a
+    8:10:java.util.Set pruneMembers(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):381:381 -> a
+    11:11:com.android.tools.r8.graph.AppInfo prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):91:91 -> a
+    12:12:com.android.tools.r8.graph.AppInfo rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):91:91 -> a
+    13:23:void lambda$pruneMembers$1(com.android.tools.r8.graph.PrunedItems,java.util.Set):384:394 -> a
+    24:27:java.util.Set pruneItems(java.util.Set,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):412:415 -> a
+    28:28:java.util.Set pruneItems(java.util.Set,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):414:414 -> a
+    29:32:void lambda$pruneItems$2(java.util.Set,java.util.Set):417:420 -> a
+    33:44:void lambda$pruneMapFromMembers$6(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):473:484 -> a
+    45:47:boolean lambda$pruneMapFromMembers$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember):479:481 -> a
+    48:50:java.util.Map pruneMap(java.util.Map,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):497:499 -> a
+    51:51:java.util.Map pruneMap(java.util.Map,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):498:498 -> a
+    52:55:void lambda$pruneMap$7(java.util.Map,java.util.Set):501:504 -> a
+    56:56:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    56:56:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):661 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1201:1202:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1108:1109 -> a
-    1203:1203:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition):1113:1113 -> a
-    1204:1205:boolean isAccessModificationAllowed(com.android.tools.r8.graph.DexReference):1117:1118 -> a
-    1204:1205:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition):1113 -> a
-    1206:1216:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1122:1132 -> a
-    1217:1217:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):358:358 -> a
-    1217:1217:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1133 -> a
-    1218:1218:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():155:155 -> a
-    1218:1218:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):359 -> a
-    1218:1218:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1133 -> a
-    1219:1221:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):360:362 -> a
-    1219:1221:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1133 -> a
-    1222:1222:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():155:155 -> a
-    1222:1222:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1140 -> a
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    57:57:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):661 -> a
+    58:59:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):664:665 -> a
+    60:71:void computeLargestCfVersion():671:671 -> a
+    60:71:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):665 -> a
+    81:81:void computeLargestCfVersion():681:681 -> a
+    81:81:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):665 -> a
+    82:82:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):667:667 -> a
+    83:86:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):562:565 -> a
+    87:87:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):563:563 -> a
+    88:89:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):567:568 -> a
+    90:90:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    90:90:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):568 -> a
+    91:110:void lambda$extendPinnedItems$8(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):570:589 -> a
+    111:111:boolean isBootstrapMethod(com.android.tools.r8.graph.ProgramMethod):729:729 -> a
+    112:112:boolean isBootstrapMethod(com.android.tools.r8.graph.DexMethod):725:725 -> a
+    112:112:boolean isBootstrapMethod(com.android.tools.r8.graph.ProgramMethod):729 -> a
+    113:128:void forEachReachableInterface(java.util.function.Consumer,java.lang.Iterable):771:786 -> a
+    129:162:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):805:838 -> a
+    163:163:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):808:808 -> a
+    164:164:void removeFromSingleTargetLookupCache(com.android.tools.r8.graph.DexClass):887:887 -> a
+    165:166:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):921:922 -> a
+    167:167:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():864:864 -> a
+    167:167:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):923 -> a
+    168:168:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> a
+    168:168:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):923 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1223:1226:com.android.tools.r8.utils.TraversalContinuation lambda$isRepackagingAllowed$12(com.android.tools.r8.graph.ProgramMember):1135:1138 -> a
-    1227:1228:boolean isPinned(com.android.tools.r8.graph.DexDefinition):1149:1150 -> a
-    1229:1230:boolean isPinned(com.android.tools.r8.graph.DexClassAndMember):1154:1155 -> a
-    1231:1231:void lambda$prunedCopyFrom$13(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder):1191:1191 -> a
-    1232:1232:void lambda$prunedCopyFrom$14(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):1192:1192 -> a
-    1233:1241:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1209:1217 -> a
-    1242:1290:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1212:1260 -> a
-    1291:1293: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):717:719 -> a
-    1291:1293:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1261 -> a
-    1294:1294:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.GraphLens.rewriteReference(com.android.tools.r8.graph.DexReference):665:665 -> a
-    1294:1294: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):719 -> a
-    1294:1294:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1261 -> a
-    1295:1295: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):719:719 -> a
-    1295:1295:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1261 -> a
-    1296:1302:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1261:1267 -> a
-    1303:1303:com.android.tools.r8.shaking.ProguardMemberRule lambda$rewrittenWithLens$16(com.android.tools.r8.graph.DexReference,java.util.List):1242:1242 -> a
-    1304:1304:com.android.tools.r8.shaking.ProguardMemberRule lambda$rewrittenWithLens$17(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexMember,java.util.List):1246:1246 -> a
-    1305:1305:java.util.Map rewriteInitClassReferences(com.android.tools.r8.graph.GraphLens):1271:1271 -> a
-    1306:1306:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$19(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1275:1275 -> a
-    1307:1307:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> a
-    1307:1307:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$19(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1275 -> a
-    1308:1309:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$19(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1275:1276 -> a
-    1310:1310:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> a
-    1310:1310:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$19(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1276 -> a
-    1311:1312:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$19(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1276:1277 -> a
-    1313:1313:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> a
-    1313:1313:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$19(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1277 -> a
-    1314:1314:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$19(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1278:1278 -> a
-    1315:1315:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> a
-    1315:1315:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$19(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1281 -> a
-    1316:1316:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$19(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1285:1285 -> a
-    1317:1322:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1309:1314 -> a
-    1317:1322:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1337 -> a
-    1323:1325:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1357:1359 -> a
-    1323:1325:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1316 -> a
-    1323:1325:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1337 -> a
-    1326:1326:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1358:1358 -> a
-    1326:1326:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1316 -> a
-    1326:1326:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1337 -> a
-    1327:1327: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):641:641 -> a
-    1327:1327:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1324 -> a
-    1327:1327:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1337 -> a
-    1328:1328:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1324:1324 -> a
-    1328:1328:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1337 -> a
-    1329:1329:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodDefinitionOrNull(com.android.tools.r8.graph.DexClassAndMethod):251:251 -> a
-    1329:1329:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1324 -> a
-    1329:1329:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1337 -> a
-    1330:1330:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1322:1322 -> a
-    1330:1330:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1337 -> a
-    1331:1333:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1357:1359 -> a
-    1331:1333:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1318 -> a
-    1331:1333:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1337 -> a
-    1334:1334:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1358:1358 -> a
-    1334:1334:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1318 -> a
-    1334:1334:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1337 -> a
-    1335:1335:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1320:1320 -> a
-    1335:1335:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1337 -> a
-    1336:1336:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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) -> a
-    1337:1338:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1346:1347 -> a
-    1339:1341:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1357:1359 -> a
-    1339:1341:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1347 -> a
-    1342:1342:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1358:1358 -> a
-    1342:1342:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1347 -> a
-    1343:1380:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1369:1406 -> a
-    1381:1381:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> a
-    1381:1381:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1406 -> a
+    169:172:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):924:927 -> a
+    173:174:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1044:1045 -> a
+    173:174:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):931 -> a
+    175:175:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    175:175:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1045 -> a
+    175:175:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):931 -> a
+    176:177:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):953:954 -> a
+    178:178:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1137,"2":1138,"3":1139}}
+    1137:1137:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):954:954 -> a
+    1138:1138:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):954:954 -> a
+    1139:1139:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):954:954 -> a
+    1132:1136:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):954:958 -> a
+    1140:1143:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClassAndMember):1012:1015 -> a
+    1144:1144:java.lang.Boolean lambda$mayPropagateValueFor$10(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):1016:1016 -> a
+    1145:1145:java.lang.Boolean lambda$mayPropagateValueFor$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1017:1017 -> a
+    1146:1146:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):1066:1066 -> a
+    1147:1147:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1070:1070 -> a
+    1148:1148:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():675:675 -> a
+    1148:1148:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1070 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1382:1382:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> a
-    1382:1382:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1406 -> a
-    1383:1391:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1407:1415 -> a
-    1392:1397: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1476:1481 -> a
-    1392:1397:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1413 -> a
-    1398:1398:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    1398:1398: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1481 -> a
-    1398:1398:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1413 -> a
-    1399:1399:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1172:1172 -> a
-    1399:1399: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1482 -> a
-    1399:1399:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1413 -> a
-    1400:1400: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1483:1483 -> a
-    1400:1400:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1413 -> a
-    1401:1401:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
-    1401:1401: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1483 -> a
-    1401:1401:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1413 -> a
-    1402:1406: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1484:1488 -> a
-    1402:1406:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1413 -> a
-    1407:1421: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1486:1500 -> a
-    1407:1421:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1413 -> a
-    1422:1434:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1421:1433 -> a
-    1435:1456:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1432:1453 -> a
-    1457:1467:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1452:1462 -> a
-    1468:1470:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1507:1509 -> a
-    1471:1471:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1527:1527 -> a
-    1472:1473:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1537:1538 -> a
-    1474:1476:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):928:930 -> a
-    1474:1476:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1546 -> a
-    1474:1476:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1539 -> a
-    1477:1477:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    1477:1477:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):932 -> a
-    1477:1477:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1546 -> a
-    1477:1477:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1539 -> a
-    1478:1478:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):932:932 -> a
-    1478:1478:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1546 -> a
-    1478:1478:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1539 -> a
-    1479:1479:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1546:1546 -> a
-    1479:1479:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1539 -> a
-    1480:1480:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1540:1540 -> a
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):92:92 -> b
-    2:2:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):92:92 -> b
-    3:5:boolean lambda$pruneMapFromMembers$5(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember):492:494 -> b
-    6:6:boolean isNeverInlineDueToSingleCallerMethod(com.android.tools.r8.graph.ProgramMethod):762:762 -> b
-    7:7:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):941:941 -> b
-    8:10:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):928:930 -> b
-    8:10:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):942 -> b
-    11:11:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> b
-    11:11:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):932 -> b
-    11:11:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):942 -> b
-    12:12:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):932:932 -> b
-    12:12:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):942 -> b
-    13:13:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):942:942 -> b
-    14:16:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):973:975 -> b
-    17:18:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1001:1002 -> b
+    1149:1150:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1070:1071 -> a
+    1151:1151:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition):1075:1075 -> a
+    1152:1153:boolean isAccessModificationAllowed(com.android.tools.r8.graph.DexReference):1079:1080 -> a
+    1152:1153:boolean isAccessModificationAllowed(com.android.tools.r8.graph.ProgramDefinition):1075 -> a
+    1154:1164:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1084:1094 -> a
+    1165:1165:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):362:362 -> a
+    1165:1165:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1095 -> a
+    1166:1166:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():155:155 -> a
+    1166:1166:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):363 -> a
+    1166:1166:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1095 -> a
+    1167:1169:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):364:366 -> a
+    1167:1169:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1095 -> a
+    1170:1170:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():155:155 -> a
+    1170:1170:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1102 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1171:1174:com.android.tools.r8.utils.TraversalContinuation lambda$isRepackagingAllowed$12(com.android.tools.r8.graph.ProgramMember):1097:1100 -> a
+    1175:1176:boolean isPinned(com.android.tools.r8.graph.DexDefinition):1111:1112 -> a
+    1177:1178:boolean isPinned(com.android.tools.r8.graph.DexClassAndMember):1116:1117 -> a
+    1179:1179:void lambda$prunedCopyFrom$13(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder):1153:1153 -> a
+    1180:1180:void lambda$prunedCopyFrom$14(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):1154:1154 -> a
+    1181:1189:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1171:1179 -> a
+    1190:1231:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1174:1215 -> a
+    1232:1234: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):717:719 -> a
+    1232:1234:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1216 -> a
+    1235:1235:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.GraphLens.rewriteReference(com.android.tools.r8.graph.DexReference):665:665 -> a
+    1235:1235: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):719 -> a
+    1235:1235:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1216 -> a
+    1236:1236: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):719:719 -> a
+    1236:1236:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1216 -> a
+    1237:1243:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1216:1222 -> a
+    1244:1244:com.android.tools.r8.shaking.ProguardMemberRule lambda$rewrittenWithLens$16(com.android.tools.r8.graph.DexReference,java.util.List):1204:1204 -> a
+    1245:1245:java.util.Map rewriteInitClassReferences(com.android.tools.r8.graph.GraphLens):1226:1226 -> a
+    1246:1246:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1230:1230 -> a
+    1247:1247:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> a
+    1247:1247:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1230 -> a
+    1248:1249:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1230:1231 -> a
+    1250:1250:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> a
+    1250:1250:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1231 -> a
+    1251:1252:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1231:1232 -> a
+    1253:1253:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> a
+    1253:1253:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1232 -> a
+    1254:1254:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1233:1233 -> a
+    1255:1255:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> a
+    1255:1255:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1236 -> a
+    1256:1256:com.android.tools.r8.utils.Visibility lambda$rewriteInitClassReferences$17(com.android.tools.r8.utils.Visibility,com.android.tools.r8.utils.Visibility):1240:1240 -> a
+    1257:1262:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1264:1269 -> a
+    1257:1262:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1292 -> a
+    1263:1265:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1312:1314 -> a
+    1263:1265:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1271 -> a
+    1263:1265:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1292 -> a
+    1266:1266:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1313:1313 -> a
+    1266:1266:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1271 -> a
+    1266:1266:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1292 -> a
+    1267:1267: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):641:641 -> a
+    1267:1267:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1279 -> a
+    1267:1267:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1292 -> a
+    1268:1268:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1279:1279 -> a
+    1268:1268:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1292 -> a
+    1269:1269:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexEncodedMethod.toMethodDefinitionOrNull(com.android.tools.r8.graph.DexClassAndMethod):251:251 -> a
+    1269:1269:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1279 -> a
+    1269:1269:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1292 -> a
+    1270:1270:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1277:1277 -> a
+    1270:1270:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1292 -> a
+    1271:1273:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1312:1314 -> a
+    1271:1273:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1273 -> a
+    1271:1273:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1292 -> a
+    1274:1274:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1313:1313 -> a
+    1274:1274:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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):1273 -> a
+    1274:1274:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1292 -> a
+    1275:1275:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,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) -> a
+    1275:1275:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1292 -> a
+    1276:1276:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.graph.AppView,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):1291:1291 -> a
+    1277:1278:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1301:1302 -> a
+    1279:1281:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1312:1314 -> a
+    1279:1281:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1302 -> a
+    1282:1282:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1313:1313 -> a
+    1282:1282:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1302 -> a
+    1283:1320:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1324:1361 -> a
+    1321:1321:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> a
+    1321:1321:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1361 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1322:1322:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> a
+    1322:1322:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1361 -> a
+    1323:1331:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1362:1370 -> a
+    1332:1337: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1431:1436 -> a
+    1332:1337:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1368 -> a
+    1338:1338:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    1338:1338: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1436 -> a
+    1338:1338:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1368 -> a
+    1339:1339:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1134:1134 -> a
+    1339:1339: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1437 -> a
+    1339:1339:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1368 -> a
+    1340:1340: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1438:1438 -> a
+    1340:1340:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1368 -> a
+    1341:1341:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.ProgramMethod):105:105 -> a
+    1341:1341: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1438 -> a
+    1341:1341:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1368 -> a
+    1342:1346: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1439:1443 -> a
+    1342:1346:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1368 -> a
+    1347:1361: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.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1441:1455 -> a
+    1347:1361:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1368 -> a
+    1362:1374:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1376:1388 -> a
+    1375:1396:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1387:1408 -> a
+    1397:1407:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.ir.analysis.type.DynamicType):1407:1417 -> a
+    1408:1410:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1462:1464 -> a
+    1411:1411:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1482:1482 -> a
+    1412:1413:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1492:1493 -> a
+    1414:1416:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):891:893 -> a
+    1414:1416:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1501 -> a
+    1414:1416:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1494 -> a
+    1417:1417:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    1417:1417:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):895 -> a
+    1417:1417:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1501 -> a
+    1417:1417:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1494 -> a
+    1418:1418:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):895:895 -> a
+    1418:1418:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1501 -> a
+    1418:1418:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1494 -> a
+    1419:1419:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1501:1501 -> a
+    1419:1419:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1494 -> a
+    1420:1420:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1495:1495 -> a
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):91:91 -> b
+    2:2:com.android.tools.r8.graph.AppInfoWithClassHierarchy rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):91:91 -> b
+    3:5:boolean lambda$pruneMembers$0(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember):389:391 -> b
+    6:6:boolean isNeverInlineDueToSingleCallerMethod(com.android.tools.r8.graph.ProgramMethod):745:745 -> b
+    7:7:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):904:904 -> b
+    8:10:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):891:893 -> b
+    8:10:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):905 -> b
+    11:11:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> b
+    11:11:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):895 -> b
+    11:11:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):905 -> b
+    12:12:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):895:895 -> b
+    12:12:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):905 -> b
+    13:13:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):905:905 -> b
+    14:16:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):935:937 -> b
+    17:18:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):963:964 -> b
     19:19:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1027,"2":1028,"3":1029}}
-    1027:1027:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1002:1002 -> b
-    1028:1028:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1002:1002 -> b
-    1029:1029:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1002:1002 -> b
-    1021:1021:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1002:1002 -> b
-    1022:1022:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():901:901 -> b
-    1022:1022:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1003 -> b
-    1023:1023:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1003:1003 -> b
-    1024:1024:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> b
-    1024:1024:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1003 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":989,"2":990,"3":991}}
+    989:989:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):964:964 -> b
+    990:990:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):964:964 -> b
+    991:991:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):964:964 -> b
+    983:983:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):964:964 -> b
+    984:984:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():864:864 -> b
+    984:984:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):965 -> b
+    985:985:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):965:965 -> b
+    986:986:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> b
+    986:986:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):965 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1025:1026:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1005:1006 -> b
-    1030:1033:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1026:1029 -> b
-    1034:1034:boolean com.android.tools.r8.graph.DexEncodedMethod.isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):470:470 -> b
-    1034:1034:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1029 -> b
+    987:988:boolean isFieldOnlyWrittenInMethodIgnoringPinning(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):967:968 -> b
+    992:995:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):988:991 -> b
+    996:996:boolean com.android.tools.r8.graph.DexEncodedMethod.isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):470:470 -> b
+    996:996:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):991 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1035:1035:boolean com.android.tools.r8.graph.DexEncodedMethod.isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):470:470 -> b
-    1035:1035:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1029 -> b
-    1036:1040:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):1059:1063 -> b
-    1041:1045:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1070:1074 -> b
-    1046:1046:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1172:1172 -> b
-    1046:1046:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1075 -> b
-    1047:1047:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1075:1075 -> b
-    1048:1048:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):109:109 -> b
-    1048:1048:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1075 -> b
-    1049:1049:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramMethod():55:55 -> b
-    1049:1049:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):111 -> b
-    1049:1049:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1075 -> b
-    1050:1051:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):113:114 -> b
-    1050:1051:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1075 -> b
-    1052:1052:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1075:1075 -> b
-    1053:1054:boolean isPinned(com.android.tools.r8.graph.DexReference):1144:1145 -> b
-    1055:1055:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
-    1055:1055:boolean isPinned(com.android.tools.r8.graph.DexReference):1145 -> b
+    997:997:boolean com.android.tools.r8.graph.DexEncodedMethod.isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):470:470 -> b
+    997:997:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):991 -> b
+    998:1002:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):1021:1025 -> b
+    1003:1007:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1032:1036 -> b
+    1008:1008:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1134:1134 -> b
+    1008:1008:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1037 -> b
+    1009:1009:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1037:1037 -> b
+    1010:1010:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):109:109 -> b
+    1010:1010:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1037 -> b
+    1011:1011:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramMethod():55:55 -> b
+    1011:1011:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):111 -> b
+    1011:1011:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1037 -> b
+    1012:1013:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):113:114 -> b
+    1012:1013:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1037 -> b
+    1014:1014:boolean mayPropagateValueFor(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):1037:1037 -> b
+    1015:1016:boolean isPinned(com.android.tools.r8.graph.DexReference):1106:1107 -> b
+    1017:1017:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
+    1017:1017:boolean isPinned(com.android.tools.r8.graph.DexReference):1107 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1056:1056:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
-    1056:1056:boolean isPinned(com.android.tools.r8.graph.DexReference):1145 -> b
-    1057:1057:void lambda$prunedCopyFrom$15(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):1194:1194 -> b
-    1058:1058:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1204:1204 -> b
-    1059:1064:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):284:289 -> b
-    1059:1064:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1204 -> b
-    1065:1065:java.util.Collection com.android.tools.r8.utils.CollectionUtils.addAll(java.util.Collection,java.util.Collection):17:17 -> b
-    1065:1065:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):289 -> b
-    1065:1065:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1204 -> b
-    1066:1066:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):289:289 -> b
-    1066:1066:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1204 -> b
-    1067:1067:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):282:282 -> b
-    1067:1067:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1204 -> b
-    1068:1068:com.android.tools.r8.shaking.ProguardMemberRule lambda$rewrittenWithLens$18(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexMember,java.util.List):1249:1249 -> b
-    1069:1069:void forEachReferencedClasspathClass(java.util.function.Consumer):1519:1519 -> b
-    1070:1074:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1550:1554 -> b
-    1075:1075:boolean com.android.tools.r8.graph.DexEncodedMethod.isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):360:360 -> b
-    1075:1075:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1555 -> b
+    1018:1018:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
+    1018:1018:boolean isPinned(com.android.tools.r8.graph.DexReference):1107 -> b
+    1019:1019:void lambda$prunedCopyFrom$15(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):1156:1156 -> b
+    1020:1020:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1166:1166 -> b
+    1021:1026:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):275:280 -> b
+    1021:1026:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1166 -> b
+    1027:1027:java.util.Collection com.android.tools.r8.utils.CollectionUtils.addAll(java.util.Collection,java.util.Collection):17:17 -> b
+    1027:1027:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):280 -> b
+    1027:1027:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1166 -> b
+    1028:1028:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):280:280 -> b
+    1028:1028:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1166 -> b
+    1029:1029:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems):273:273 -> b
+    1029:1029:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems):1166 -> b
+    1030:1030:void forEachReferencedClasspathClass(java.util.function.Consumer):1474:1474 -> b
+    1031:1035:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1505:1509 -> b
+    1036:1036:boolean com.android.tools.r8.graph.DexEncodedMethod.isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):360:360 -> b
+    1036:1036:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1510 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1076:1078:boolean com.android.tools.r8.graph.DexEncodedMethod.isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):360:362 -> b
-    1076:1078:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1555 -> b
-    1079:1083:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1555:1559 -> b
-    1:3:boolean lambda$pruneMembers$0(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember):402:404 -> c
-    4:9:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):534:539 -> c
-    10:11:boolean isNeverReprocessMethod(com.android.tools.r8.graph.ProgramMethod):794:795 -> c
-    12:12:void mutateObjectAllocationInfoCollection(java.util.function.Consumer):920:920 -> c
-    13:14:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):936:937 -> c
-    15:16:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):979:980 -> c
-    17:17:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():901:901 -> c
-    17:17:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):981 -> c
-    18:18:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> c
-    18:18:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):981 -> c
+    1037:1039:boolean com.android.tools.r8.graph.DexEncodedMethod.isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):360:362 -> b
+    1037:1039:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1510 -> b
+    1040:1044:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1510:1514 -> b
+    1:6:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithMainDexInfo(com.android.tools.r8.shaking.MainDexInfo):521:526 -> c
+    7:8:boolean isNeverReprocessMethod(com.android.tools.r8.graph.ProgramMethod):757:758 -> c
+    9:9:void mutateObjectAllocationInfoCollection(java.util.function.Consumer):883:883 -> c
+    10:11:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):899:900 -> c
+    12:13:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):941:942 -> c
+    14:14:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():864:864 -> c
+    14:14:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):943 -> c
+    15:15:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField) -> c
+    15:15:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):943 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):982:982 -> c
-    20:21:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1082:1083 -> c
-    20:21:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):987 -> c
-    22:22:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> c
-    22:22:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1083 -> c
-    22:22:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):987 -> c
-    23:38:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1182:1197 -> c
-    39:43:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):329:333 -> c
-    39:43:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    44:44:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):377:377 -> c
-    44:44:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):335 -> c
-    44:44:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    45:45:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):335:335 -> c
-    45:45:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    46:46:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):420:420 -> c
-    46:46:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):336 -> c
-    46:46:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    47:47:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):336:336 -> c
-    47:47:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    48:48:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):420:420 -> c
-    48:48:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):337 -> c
-    48:48:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    49:49:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):337:337 -> c
-    49:49:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    50:50:java.util.Set pruneFields(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):385:385 -> c
-    50:50:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):338 -> c
-    50:50:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    51:51:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):338:338 -> c
-    51:51:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    52:52:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):420:420 -> c
-    52:52:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):339 -> c
-    52:52:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    53:53:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):339:339 -> c
-    53:53:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    54:54:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):420:420 -> c
-    54:54:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):340 -> c
-    54:54:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    55:55:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):340:340 -> c
-    55:55:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    56:56:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):420:420 -> c
-    56:56:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):342 -> c
-    56:56:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    57:65:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):342:350 -> c
-    57:65:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    66:66:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):420:420 -> c
-    66:66:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):351 -> c
-    66:66:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    67:67:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):351:351 -> c
-    67:67:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    68:68:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):420:420 -> c
-    68:68:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):352 -> c
-    68:68:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    69:69:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):352:352 -> c
-    69:69:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    70:70:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):420:420 -> c
-    70:70:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):353 -> c
-    70:70:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    71:71:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):353:353 -> c
-    71:71:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    72:72:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):420:420 -> c
-    72:72:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):354 -> c
-    72:72:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    73:73:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):354:354 -> c
-    73:73:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    74:74:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):420:420 -> c
-    74:74:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):355 -> c
-    74:74:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    75:75:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):355:355 -> c
-    75:75:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    76:76:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):377:377 -> c
-    76:76:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):357 -> c
-    76:76:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    77:77:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):357:357 -> c
-    77:77:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    78:78:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):377:377 -> c
-    78:78:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):358 -> c
-    78:78:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    79:79:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):358:358 -> c
-    79:79:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    80:80:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):377:377 -> c
-    80:80:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):359 -> c
-    80:80:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    81:81:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):359:359 -> c
-    81:81:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    82:82:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):377:377 -> c
-    82:82:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):360 -> c
-    82:82:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    83:88:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):360:365 -> c
-    83:88:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    89:89:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):377:377 -> c
-    89:89:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):367 -> c
-    89:89:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    90:90:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):367:367 -> c
-    90:90:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    91:91:java.util.Map pruneMapFromClasses(java.util.Map,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):446:446 -> c
-    91:91:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):368 -> c
-    91:91:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    92:92:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):368:368 -> c
-    92:92:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    93:93:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):328:328 -> c
-    93:93:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1197 -> c
-    94:94:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1199:1199 -> c
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMap(com.android.tools.r8.graph.DexField):895:896 -> d
-    3:4:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1014:1015 -> d
+    16:16:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):944:944 -> c
+    17:18:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1044:1045 -> c
+    17:18:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):949 -> c
+    19:19:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> c
+    19:19:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):1045 -> c
+    19:19:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):949 -> c
+    20:30:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1144:1154 -> c
+    31:31:boolean com.android.tools.r8.graph.PrunedItems.hasRemovedMembers():91:91 -> c
+    31:31:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1155 -> c
+    32:35:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1156:1159 -> c
+    36:40:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):318:322 -> c
+    36:40:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    41:41:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):364:364 -> c
+    41:41:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):324 -> c
+    41:41:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    42:42:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):324:324 -> c
+    42:42:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    43:43:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):407:407 -> c
+    43:43:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):325 -> c
+    43:43:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    44:44:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):325:325 -> c
+    44:44:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    45:45:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):407:407 -> c
+    45:45:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):326 -> c
+    45:45:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    46:46:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):326:326 -> c
+    46:46:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    47:47:java.util.Set pruneFields(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):372:372 -> c
+    47:47:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):327 -> c
+    47:47:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    48:48:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):327:327 -> c
+    48:48:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    49:49:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):407:407 -> c
+    49:49:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):328 -> c
+    49:49:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    50:50:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):328:328 -> c
+    50:50:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    51:51:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):407:407 -> c
+    51:51:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):329 -> c
+    51:51:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    52:52:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):329:329 -> c
+    52:52:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    53:53:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):407:407 -> c
+    53:53:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):331 -> c
+    53:53:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    54:59:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):331:336 -> c
+    54:59:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    60:60:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):407:407 -> c
+    60:60:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):338 -> c
+    60:60:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    61:61:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):338:338 -> c
+    61:61:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    62:62:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):407:407 -> c
+    62:62:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):339 -> c
+    62:62:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    63:63:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):339:339 -> c
+    63:63:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    64:64:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):407:407 -> c
+    64:64:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):340 -> c
+    64:64:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    65:65:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):340:340 -> c
+    65:65:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    66:66:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):407:407 -> c
+    66:66:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):341 -> c
+    66:66:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    67:67:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):341:341 -> c
+    67:67:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    68:68:java.util.Set pruneMethods(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):407:407 -> c
+    68:68:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):342 -> c
+    68:68:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    69:69:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):342:342 -> c
+    69:69:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    70:70:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):364:364 -> c
+    70:70:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):344 -> c
+    70:70:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    71:71:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):344:344 -> c
+    71:71:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    72:72:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):364:364 -> c
+    72:72:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):345 -> c
+    72:72:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    73:73:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):345:345 -> c
+    73:73:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    74:74:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):364:364 -> c
+    74:74:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):346 -> c
+    74:74:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    75:75:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):346:346 -> c
+    75:75:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    76:76:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):364:364 -> c
+    76:76:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):347 -> c
+    76:76:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    77:82:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):347:352 -> c
+    77:82:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    83:83:java.util.Set pruneClasses(java.util.Set,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):364:364 -> c
+    83:83:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):354 -> c
+    83:83:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    84:84:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):354:354 -> c
+    84:84:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    85:85:java.util.Map pruneMapFromClasses(java.util.Map,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):433:433 -> c
+    85:85:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):355 -> c
+    85:85:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    86:86:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):355:355 -> c
+    86:86:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    87:87:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService,java.util.List):317:317 -> c
+    87:87:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1159 -> c
+    88:88:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.PrunedItems,java.util.concurrent.ExecutorService):1161:1161 -> c
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMap(com.android.tools.r8.graph.DexField):858:859 -> d
+    3:4:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):976:977 -> d
     5:5:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1030,"2":1031,"3":1032}}
-    1030:1030:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1015:1015 -> d
-    1031:1031:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1015:1015 -> d
-    1032:1032:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1015:1015 -> d
-    1020:1021:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1015:1016 -> d
-    1022:1022:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():901:901 -> d
-    1022:1022:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1019 -> d
-    1023:1023:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1019:1019 -> d
-    1024:1024:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> d
-    1024:1024:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1019 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":992,"2":993,"3":994}}
+    992:992:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):977:977 -> d
+    993:993:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):977:977 -> d
+    994:994:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):977:977 -> d
+    982:983:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):977:978 -> d
+    984:984:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():864:864 -> d
+    984:984:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):981 -> d
+    985:985:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):981:981 -> d
+    986:986:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> d
+    986:986:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):981 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1025:1029:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):1020:1024 -> d
-    1033:1034:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):1087:1088 -> d
-    1:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):663:668 -> e
+    987:991:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):982:986 -> d
+    995:996:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):1049:1050 -> d
+    1:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):646:651 -> e
     7:7:boolean com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper.isCompanionClassType(com.android.tools.r8.graph.DexType):162:162 -> e
-    7:7:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):668 -> e
+    7:7:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):651 -> e
     8:8:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):116:116 -> e
-    8:8:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):670 -> e
-    9:9:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):664:664 -> e
+    8:8:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):653 -> e
+    9:9:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):647:647 -> e
     10:10:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":675,"2":676,"3":677,"4":678,"5":679}}
-    675:675:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):664:664 -> e
-    676:676:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):664:664 -> e
-    677:677:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):664:664 -> e
-    678:678:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):664:664 -> e
-    679:679:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):664:664 -> e
-    674:674:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):664:664 -> e
-    680:680:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):702:702 -> e
-    681:682:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):946:947 -> e
-    683:683:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():901:901 -> e
-    683:683:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):948 -> e
-    684:684:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> e
-    684:684:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):948 -> e
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":658,"2":659,"3":660,"4":661,"5":662}}
+    658:658:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):647:647 -> e
+    659:659:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):647:647 -> e
+    660:660:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):647:647 -> e
+    661:661:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):647:647 -> e
+    662:662:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):647:647 -> e
+    657:657:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):647:647 -> e
+    663:663:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):685:685 -> e
+    664:665:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):909:910 -> e
+    666:666:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():864:864 -> e
+    666:666:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):911 -> e
+    667:667:com.android.tools.r8.graph.FieldAccessInfo com.android.tools.r8.graph.FieldAccessInfoCollectionImpl.get(com.android.tools.r8.graph.DexField):15:15 -> e
+    667:667:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):911 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    685:685:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):950:950 -> e
-    686:686:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1172:1172 -> e
-    686:686:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):955 -> e
-    687:687:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):955:955 -> e
-    688:688:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):122:122 -> e
-    688:688:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):955 -> e
-    689:689:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramField():60:60 -> e
-    689:689:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):124 -> e
-    689:689:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):955 -> e
-    690:691:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):126:127 -> e
-    690:691:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):955 -> e
-    692:692:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):955:955 -> e
-    1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):1033:1034 -> f
+    668:668:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):913:913 -> e
+    669:669:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1134:1134 -> e
+    669:669:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):916 -> e
+    670:670:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):916:916 -> e
+    671:671:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):122:122 -> e
+    671:671:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):916 -> e
+    672:672:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramField():60:60 -> e
+    672:672:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):124 -> e
+    672:672:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):916 -> e
+    673:674:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):126:127 -> e
+    673:674:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):916 -> e
+    675:675:boolean isReachableOrReferencedField(com.android.tools.r8.graph.DexEncodedField):916:916 -> e
+    1:2:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):995:996 -> f
     3:3:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):0:0 -> f
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1041,"2":1042,"3":1043}}
-    1041:1041:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):1034:1034 -> f
-    1042:1042:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):1034:1034 -> f
-    1043:1043:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):1034:1034 -> f
-    1037:1040:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):1034:1037 -> f
-    1044:1044:void lambda$verifyNoIteratingOverPrunedClasses$22(com.android.tools.r8.graph.DexProgramClass):1580:1580 -> f
-    1:1:boolean isAlwaysInlineMethod(com.android.tools.r8.graph.DexMethod):754:754 -> h
-    2:6:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):1159:1163 -> h
-    1:1:boolean isFailedResolutionTarget(com.android.tools.r8.graph.DexMethod):730:730 -> i
-    2:2:boolean isLockCandidate(com.android.tools.r8.graph.DexType):887:887 -> i
-    3:3:boolean hasLiveness():1093:1093 -> i
-    1:1:boolean isLiveMethod(com.android.tools.r8.graph.DexMethod):722:722 -> j
-    2:2:boolean isNoHorizontalClassMergingOfType(com.android.tools.r8.graph.DexType):1568:1568 -> j
-    1:1:boolean isTargetedMethod(com.android.tools.r8.graph.DexMethod):726:726 -> k
-    2:2:boolean isNoVerticalClassMergingOfType(com.android.tools.r8.graph.DexType):1573:1573 -> k
-    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):711:718 -> l
-    9:9:boolean isWhyAreYouNotInliningMethod(com.android.tools.r8.graph.DexMethod):786:786 -> l
-    boolean lambda$lookupSingleVirtualTarget$20(com.android.tools.r8.graph.DexType) -> m
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):1294:1295 -> n
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():1099:1099 -> o
-    1:1:com.android.tools.r8.graph.SubtypingInfo computeSubtypingInfo():1563:1563 -> s
-    1:1:java.util.Set getDeadProtoTypes():891:891 -> t
-    1:1:java.util.Set getFailedFieldResolutionTargets():738:738 -> u
-    1:1:java.util.Set getFailedMethodResolutionTargets():734:734 -> v
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():901:901 -> w
-    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1172:1172 -> x
-    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection getMethodAccessInfoCollection():910:910 -> y
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl getMutableFieldAccessInfoCollection():905:905 -> z
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1003,"2":1004,"3":1005}}
+    1003:1003:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):996:996 -> f
+    1004:1004:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):996:996 -> f
+    1005:1005:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):996:996 -> f
+    999:1002:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):996:999 -> f
+    1006:1006:void lambda$verifyNoIteratingOverPrunedClasses$20(com.android.tools.r8.graph.DexProgramClass):1535:1535 -> f
+    1:1:boolean isAlwaysInlineMethod(com.android.tools.r8.graph.DexMethod):737:737 -> h
+    2:6:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):1121:1125 -> h
+    1:1:boolean isFailedResolutionTarget(com.android.tools.r8.graph.DexMethod):713:713 -> i
+    2:2:boolean isLockCandidate(com.android.tools.r8.graph.DexType):850:850 -> i
+    3:3:boolean hasLiveness():1055:1055 -> i
+    1:1:boolean isLiveMethod(com.android.tools.r8.graph.DexMethod):705:705 -> j
+    2:2:boolean isNoHorizontalClassMergingOfType(com.android.tools.r8.graph.DexType):1523:1523 -> j
+    1:1:boolean isTargetedMethod(com.android.tools.r8.graph.DexMethod):709:709 -> k
+    2:2:boolean isNoVerticalClassMergingOfType(com.android.tools.r8.graph.DexType):1528:1528 -> k
+    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):694:701 -> l
+    9:9:boolean isWhyAreYouNotInliningMethod(com.android.tools.r8.graph.DexMethod):749:749 -> l
+    boolean lambda$lookupSingleVirtualTarget$18(com.android.tools.r8.graph.DexType) -> m
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):1249:1250 -> n
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():1061:1061 -> o
+    1:1:com.android.tools.r8.graph.SubtypingInfo computeSubtypingInfo():1518:1518 -> s
+    1:1:java.util.Set getDeadProtoTypes():854:854 -> t
+    1:1:java.util.Set getFailedFieldResolutionTargets():721:721 -> u
+    1:1:java.util.Set getFailedMethodResolutionTargets():717:717 -> v
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():864:864 -> w
+    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1134:1134 -> x
+    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection getMethodAccessInfoCollection():873:873 -> y
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl getMutableFieldAccessInfoCollection():868:868 -> z
 com.android.tools.r8.shaking.AppInfoWithLivenessModifier -> com.android.tools.r8.shaking.i:
     java.util.Set noLongerInstantiatedClasses -> a
     java.util.Set noLongerWrittenFields -> b
@@ -113154,7 +113846,61 @@
     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.ha:
+com.android.tools.r8.shaking.AssumeInfoCollection -> com.android.tools.r8.internal.T3:
+    java.util.Map backing -> a
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():23:23 -> <clinit>
+    1:3:void <init>(java.util.Map):27:29 -> <init>
+    1:1:com.android.tools.r8.shaking.AssumeInfoCollection$Builder builder():33:33 -> a
+    2:2:boolean contains(com.android.tools.r8.graph.DexClassAndMember):37:37 -> a
+    3:3:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo get(com.android.tools.r8.graph.DexMember):41:41 -> a
+    4:12:com.android.tools.r8.shaking.AssumeInfoCollection rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):57:65 -> a
+    13:13:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):60:60 -> a
+    14:15:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):339:340 -> a
+    14:15:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):60 -> a
+    16:16:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):333:333 -> a
+    16:16:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):340 -> a
+    16:16:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):60 -> a
+    17:17:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):341:341 -> a
+    17:17:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):60 -> a
+    18:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):345:345 -> a
+    18:18:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):341 -> a
+    18:18:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):60 -> a
+    19:21:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):61:63 -> a
+    22:32:com.android.tools.r8.shaking.AssumeInfoCollection withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):69:79 -> a
+    33:36:void lambda$withoutPrunedItems$1(com.android.tools.r8.graph.PrunedItems,java.util.Map,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):72:75 -> a
+com.android.tools.r8.shaking.AssumeInfoCollection$Builder -> com.android.tools.r8.internal.S3:
+    java.util.Map backing -> a
+    1:3:void <init>():82:84 -> <init>
+    1:1:com.android.tools.r8.shaking.AssumeInfoCollection$Builder applyIf(boolean,java.util.function.Consumer):88:88 -> a
+    2:3:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo buildInfo(com.android.tools.r8.graph.DexClassAndMember):94:95 -> a
+    4:4:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder getOrCreateAssumeInfo(com.android.tools.r8.graph.DexMember):99:99 -> a
+    5:5:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.getOrCreateAssumeInfo(com.android.tools.r8.graph.DexClassAndMember):103:103 -> a
+    5:5:com.android.tools.r8.shaking.AssumeInfoCollection$Builder meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):116 -> a
+    6:6:com.android.tools.r8.shaking.AssumeInfoCollection$Builder meetAssumeType(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.type.DynamicType):116:116 -> a
+    7:7:com.android.tools.r8.shaking.AssumeInfoCollection$Builder meet(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo):111:111 -> a
+    8:8:com.android.tools.r8.shaking.AssumeInfoCollection$Builder meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):121:121 -> a
+    9:9:com.android.tools.r8.shaking.AssumeInfoCollection$Builder meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):126:126 -> a
+    10:10:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.meetAssumeValue(com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.analysis.value.AbstractValue):121:121 -> a
+    10:10:com.android.tools.r8.shaking.AssumeInfoCollection$Builder meetAssumeValue(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.ir.analysis.value.AbstractValue):126 -> a
+    11:11:com.android.tools.r8.shaking.AssumeInfoCollection$Builder setIsSideEffectFree(com.android.tools.r8.graph.DexMember):130:130 -> a
+    12:12:com.android.tools.r8.shaking.AssumeInfoCollection$Builder setIsSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):135:135 -> a
+    13:13:com.android.tools.r8.shaking.AssumeInfoCollection$Builder com.android.tools.r8.shaking.AssumeInfoCollection$Builder.setIsSideEffectFree(com.android.tools.r8.graph.DexMember):130:130 -> a
+    13:13:com.android.tools.r8.shaking.AssumeInfoCollection$Builder setIsSideEffectFree(com.android.tools.r8.graph.DexClassAndMember):135 -> a
+    14:24:com.android.tools.r8.shaking.AssumeInfoCollection build():139:149 -> a
+    25:25:com.android.tools.r8.shaking.AssumeInfoCollection build():140:140 -> a
+    26:26:void lambda$build$1(java.util.function.BiConsumer):142:142 -> a
+    27:29:void lambda$build$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexMember,com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo$Builder):144:146 -> a
+    1:1:boolean isEmpty():107:107 -> b
+com.android.tools.r8.shaking.CheckEnumUnboxedRule -> com.android.tools.r8.shaking.k:
+    int $r8$clinit -> r
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
+    1:1:java.lang.String typeString():82:82 -> C
+com.android.tools.r8.shaking.CheckEnumUnboxedRule$Builder -> com.android.tools.r8.shaking.j:
+    1:1:void <init>(com.android.tools.r8.shaking.CheckEnumUnboxedRule$1):15:15 -> <init>
+    2:2:void <init>():19:19 -> <init>
+    com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer -> com.android.tools.r8.internal.ka:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexField clinitField -> b
     com.android.tools.r8.graph.InitClassLens$Builder lensBuilder -> c
@@ -113188,10 +113934,10 @@
     39:39:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):71 -> a
     40:50:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):77:87 -> a
     51:60:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):84:93 -> a
-com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.internal.ga:
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer$1 -> com.android.tools.r8.internal.ja:
     int[] $SwitchMap$com$android$tools$r8$utils$Visibility -> a
     1:1:void <clinit>():101:101 -> <clinit>
-com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.k:
+com.android.tools.r8.shaking.ClassInlineRule -> com.android.tools.r8.shaking.m:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> r
     int $r8$clinit -> s
     1:15: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.ClassInlineRule$Type):73:87 -> <init>
@@ -113205,17 +113951,17 @@
     125:125:java.lang.String typeString():112:112 -> C
     1:1:com.android.tools.r8.shaking.ClassInlineRule$Type getType():95:95 -> D
     com.android.tools.r8.shaking.ClassInlineRule asClassInlineRule() -> q
-com.android.tools.r8.shaking.ClassInlineRule$Builder -> com.android.tools.r8.shaking.j:
+com.android.tools.r8.shaking.ClassInlineRule$Builder -> com.android.tools.r8.shaking.l:
     com.android.tools.r8.shaking.ClassInlineRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.ClassInlineRule$1):18:18 -> <init>
     2:2:void <init>():21:21 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ClassInlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.wa:
+com.android.tools.r8.shaking.ClassInlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.za:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.oc:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.rc:
     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>
@@ -113225,7 +113971,16 @@
     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.DefaultEnqueuerUseRegistry -> com.android.tools.r8.shaking.l:
+com.android.tools.r8.shaking.ConvertCheckNotNullRule -> com.android.tools.r8.shaking.o:
+    int $r8$clinit -> r
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ConvertCheckNotNullRule$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>
+    1:1:java.lang.String typeString():88:88 -> C
+com.android.tools.r8.shaking.ConvertCheckNotNullRule$Builder -> com.android.tools.r8.shaking.n:
+    1:1:void <init>(com.android.tools.r8.shaking.ConvertCheckNotNullRule$1):15:15 -> <init>
+    2:2:void <init>():19:19 -> <init>
+    com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
+com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry -> com.android.tools.r8.shaking.p:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> f
     com.android.tools.r8.graph.AppView appView -> e
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> g
@@ -113234,7 +113989,7 @@
     1:2:void registerRecordFieldValues(com.android.tools.r8.graph.DexField[]):61:62 -> a
     3:4:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):73:74 -> a
     5:6:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):97:98 -> a
-    7:7:void com.android.tools.r8.shaking.Enqueuer.traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1549:1549 -> a
+    7:7:void com.android.tools.r8.shaking.Enqueuer.traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1556:1556 -> a
     7:7:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):98 -> a
     8:8:void registerConstClass(com.android.tools.r8.graph.DexType,java.util.ListIterator,boolean):159:159 -> a
     9:9:void registerCheckCast(com.android.tools.r8.graph.DexType,boolean):164:164 -> a
@@ -113261,7 +114016,7 @@
     29:30:void registerInstanceFieldReadFromRecordMethodHandle(com.android.tools.r8.graph.DexField):108:109 -> a
     29:30:void registerRecordCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite):218 -> a
     29:30:void registerCallSite(com.android.tools.r8.graph.DexCallSite):199 -> a
-    31:31:void com.android.tools.r8.shaking.Enqueuer.traceInstanceFieldReadFromRecordMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1557:1557 -> a
+    31:31:void com.android.tools.r8.shaking.Enqueuer.traceInstanceFieldReadFromRecordMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1564:1564 -> a
     31:31:void registerInstanceFieldReadFromRecordMethodHandle(com.android.tools.r8.graph.DexField):109 -> a
     31:31:void registerRecordCallSiteBootstrapArgs(com.android.tools.r8.graph.DexCallSite):218 -> a
     31:31:void registerCallSite(com.android.tools.r8.graph.DexCallSite):199 -> a
@@ -113272,41 +114027,41 @@
     1:1:void registerInitClass(com.android.tools.r8.graph.DexType):56:56 -> b
     2:3:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):85:86 -> b
     4:5:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):103:104 -> b
-    6:6:void com.android.tools.r8.shaking.Enqueuer.traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1553:1553 -> b
+    6:6:void com.android.tools.r8.shaking.Enqueuer.traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1560:1560 -> b
     6:6:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):104 -> b
     1:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):114:115 -> c
-    3:3:void com.android.tools.r8.shaking.Enqueuer.traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1707:1707 -> c
+    3:3:void com.android.tools.r8.shaking.Enqueuer.traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1714:1714 -> c
     3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):115 -> c
     4:4:void registerInstanceOf(com.android.tools.r8.graph.DexType):179:179 -> c
     1:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):79:80 -> d
     3:4:void registerInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):120:121 -> d
-    5:5:void com.android.tools.r8.shaking.Enqueuer.traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1711:1711 -> d
+    5:5:void com.android.tools.r8.shaking.Enqueuer.traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1718:1718 -> d
     5:5:void registerInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):121 -> d
     6:7:void registerNewInstance(com.android.tools.r8.graph.DexType):126:127 -> d
     1:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):132:133 -> e
-    3:3:void com.android.tools.r8.shaking.Enqueuer.traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1774:1774 -> e
+    3:3:void com.android.tools.r8.shaking.Enqueuer.traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1781:1781 -> e
     3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):133 -> e
     4:4:void registerSafeCheckCast(com.android.tools.r8.graph.DexType):169:169 -> e
     1:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):91:92 -> f
     3:4:void registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):138:139 -> f
-    5:5:void com.android.tools.r8.shaking.Enqueuer.traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1778:1778 -> f
+    5:5:void com.android.tools.r8.shaking.Enqueuer.traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1785:1785 -> f
     5:5:void registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):139 -> f
     6:6:void registerTypeReference(com.android.tools.r8.graph.DexType):174:174 -> f
     7:7:com.android.tools.r8.androidapi.ComputedApiLevel getMaxApiReferenceLevel():231:231 -> f
     1:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):67:68 -> g
     3:4:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):144:145 -> g
-    5:5:void com.android.tools.r8.shaking.Enqueuer.traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1858:1858 -> g
+    5:5:void com.android.tools.r8.shaking.Enqueuer.traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1865:1865 -> g
     5:5:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):145 -> g
     1:2:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):150:151 -> h
-    3:3:void com.android.tools.r8.shaking.Enqueuer.traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1862:1862 -> h
+    3:3:void com.android.tools.r8.shaking.Enqueuer.traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1869:1869 -> h
     3:3:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):151 -> h
-com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.Cf:
+com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.Gf:
     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$InterfaceMethodSyntheticBridgeAction -> com.android.tools.r8.shaking.m:
+com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction -> com.android.tools.r8.shaking.q:
     java.util.function.Consumer action -> c
     com.android.tools.r8.graph.ProgramMethod singleTarget -> b
     com.android.tools.r8.graph.ProgramMethod methodToKeep -> a
@@ -113316,7 +114071,7 @@
     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.DependentMinimumKeepInfoCollection -> com.android.tools.r8.internal.Ff:
+com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection -> com.android.tools.r8.internal.Jf:
     java.util.Map dependentMinimumKeepInfo -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():29:29 -> <clinit>
@@ -113375,11 +114130,11 @@
     64:64:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.MinimumKeepInfoCollection):157 -> a
     65:66:void lambda$rewrittenWithLens$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.MinimumKeepInfoCollection):159:160 -> a
     1:1:com.android.tools.r8.shaking.MinimumKeepInfoCollection remove(com.android.tools.r8.shaking.EnqueuerEvent):123:123 -> b
-com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.shaking.n:
+com.android.tools.r8.shaking.DexStringCache -> com.android.tools.r8.shaking.r:
     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.Th:
+com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.Xh:
     java.util.List failed -> b
     com.android.tools.r8.graph.AppView appView -> a
     boolean $assertionsDisabled -> c
@@ -113400,17 +114155,17 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:5:com.android.tools.r8.shaking.DiscardedChecker createForMainDex(com.android.tools.r8.graph.AppView):41:41 -> b
     6:6:boolean isCheckDiscardedEnabled(com.android.tools.r8.graph.ProgramDefinition):66:66 -> b
-com.android.tools.r8.shaking.DiscardedChecker$1 -> com.android.tools.r8.internal.Sh:
+com.android.tools.r8.shaking.DiscardedChecker$1 -> com.android.tools.r8.internal.Wh:
     com.android.tools.r8.shaking.MinimumKeepInfoCollection val$unconditionalKeepInfo -> d
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MinimumKeepInfoCollection):41:41 -> <init>
     1:3:boolean isCheckDiscardedEnabled(com.android.tools.r8.graph.ProgramDefinition):45:45 -> b
-com.android.tools.r8.shaking.EmptyEnqueuerDeferredTracing -> com.android.tools.r8.shaking.o:
+com.android.tools.r8.shaking.EmptyEnqueuerDeferredTracing -> com.android.tools.r8.shaking.s:
     1:1:void <init>():15:15 -> <init>
     boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata) -> a
     boolean enqueueWorklistActions(com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void notifyReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod) -> a
     void rewriteApplication(java.util.concurrent.ExecutorService) -> a
-com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.shaking.v:
+com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.shaking.z:
     java.util.Set identifierNameStrings -> w
     com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason directlyInitializedInterfaces -> D
     com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder methodAccessInfoCollection -> t
@@ -113478,2279 +114233,2298 @@
     boolean $assertionsDisabled -> o0
     com.android.tools.r8.shaking.EnqueuerDeferredTracing deferredTracing -> k
     com.android.tools.r8.shaking.RootSetUtils$RootSet rootSet -> o
-    1:1:void <clinit>():200:200 -> <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):467:467 -> <init>
-    2:4219: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):246:4463 -> <init>
-    4220:4266: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):468:514 -> <init>
+    1:1:void <clinit>():201:201 -> <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):468:468 -> <init>
+    2:4249: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):247:4494 -> <init>
+    4250:4296: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):469:515 -> <init>
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isInvokeStatic():0:0 -> a
-    1:1:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5024 -> a
-    2:7:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5025:5030 -> a
+    1:1:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5059 -> a
+    2:7:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5060:5065 -> a
     8:8:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    8:8:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5030 -> a
-    9:17:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5035:5043 -> a
-    18:18:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):844:844 -> a
-    18:18:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5047 -> a
-    19:19:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5048:5048 -> a
+    8:8:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5065 -> a
+    9:17:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5070:5078 -> a
+    18:18:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):845:845 -> a
+    18:18:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5082 -> a
+    19:19:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5083:5083 -> a
     20:20:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    20:20:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5049 -> a
-    21:36:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5050:5065 -> a
+    20:20:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5084 -> a
+    21:36:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5085:5100 -> a
     37:37:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    37:37:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5066 -> a
-    38:38:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5067:5067 -> a
-    39:39:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):302:302 -> a
-    39:39:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5067 -> a
-    40:44:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5076:5080 -> a
+    37:37:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5101 -> a
+    38:38:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5102:5102 -> a
+    39:39:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):306:306 -> a
+    39:39:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5102 -> a
+    40:44:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5111:5115 -> a
     45:45:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> a
-    45:45:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3187 -> a
-    46:48:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3190:3192 -> a
+    45:45:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3199 -> a
+    46:48:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3202:3204 -> a
     49:49:boolean com.android.tools.r8.shaking.EnqueuerEvent.isLiveClassEvent():0:0 -> a
-    49:49:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3196 -> a
-    50:50:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3197:3197 -> a
+    49:49:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3208 -> a
+    50:50:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3209:3209 -> a
     51:51:boolean com.android.tools.r8.shaking.EnqueuerEvent.isInstantiatedClassEvent():0:0 -> a
-    51:51:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3199 -> a
-    52:52:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3200:3200 -> a
+    51:51:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3211 -> a
+    52:52:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3212:3212 -> a
     53:54:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> a
-    53:54:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3200 -> a
-    55:55:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3203:3203 -> a
+    53:54:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3212 -> a
+    55:55:boolean isPreconditionForMinimumKeepInfoSatisfied(com.android.tools.r8.shaking.EnqueuerEvent):3215:3215 -> a
     com.android.tools.r8.shaking.KeepReason lambda$keepClassAndAllMembers$61(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness) -> a
-    com.android.tools.r8.graph.DexApplication lambda$postProcessingDesugaring$121(com.android.tools.r8.graph.DexApplication) -> a
+    com.android.tools.r8.graph.DexApplication lambda$postProcessingDesugaring$122(com.android.tools.r8.graph.DexApplication) -> a
     56:56:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    56:56:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694 -> a
-    57:57:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694:3694 -> a
+    56:56:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706 -> a
+    57:57:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706:3706 -> a
     58:58:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):87:87 -> a
-    58:58:void disableClosedWorldReasoning(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1157 -> a
-    59:60:void disableClosedWorldReasoning(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1157:1158 -> a
-    61:61:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1000(com.android.tools.r8.shaking.Enqueuer):200:200 -> a
-    62:62:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):200:200 -> a
-    63:66:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3040:3043 -> a
-    63:66:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):200 -> a
-    67:67:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2006:2006 -> a
-    67:67:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3044 -> a
-    67:67:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):200 -> a
-    68:68:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3048:3048 -> a
-    68:68:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):200 -> a
-    69:69:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):200:200 -> a
-    70:71:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):657:658 -> a
-    70:71:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):200 -> a
-    72:72: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):200:200 -> a
-    73:73:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):833:833 -> a
-    73:73: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):200 -> a
-    74:74: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):200:200 -> a
-    75:75:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):200:200 -> a
-    76:76:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):200:200 -> a
-    77:77:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):200:200 -> a
-    78:78: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):200:200 -> a
-    79:79:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):200:200 -> a
+    58:58:void disableClosedWorldReasoning(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1164 -> a
+    59:60:void disableClosedWorldReasoning(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1164:1165 -> a
+    61:61:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1000(com.android.tools.r8.shaking.Enqueuer):201:201 -> a
+    62:62:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):201:201 -> a
+    63:66:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3052:3055 -> a
+    63:66:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):201 -> a
+    67:67:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2013:2013 -> a
+    67:67:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3056 -> a
+    67:67:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):201 -> a
+    68:68:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3060:3060 -> a
+    68:68:void access$1400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):201 -> a
+    69:69:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):201:201 -> a
+    70:71:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):658:659 -> a
+    70:71:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):201 -> a
+    72:72: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):201:201 -> a
+    73:73:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):834:834 -> a
+    73:73: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):201 -> a
+    74:74: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):201:201 -> a
+    75:75:void access$2000(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):201:201 -> a
+    76:76:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):201:201 -> a
+    77:77:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):201:201 -> a
+    78:78: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):201:201 -> a
+    79:79:void access$2600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):201:201 -> a
     80:80:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
-    80:80:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1330 -> a
+    80:80:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1337 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     81:81:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
-    81:81:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1330 -> a
-    82:84:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1330:1332 -> a
+    81:81:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1337 -> a
+    82:84:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1337:1339 -> a
     85:85:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):87:87 -> a
-    85:85:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1334 -> a
-    86:86:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    86:86:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1335 -> a
-    87:91:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1336:1340 -> a
-    92:92:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):494:494 -> a
-    93:93:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):542:542 -> a
-    93:93:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):494 -> a
-    94:94:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):532:532 -> a
-    95:95:com.android.tools.r8.shaking.Enqueuer registerFieldAccessAnalysis(com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):547:547 -> a
-    96:96:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):552:552 -> a
-    97:97:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):562:562 -> a
-    98:98:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):572:572 -> a
-    99:99:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):586:586 -> a
-    100:100:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):593:593 -> a
-    100:100:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):588 -> a
-    101:101:boolean addLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):597:597 -> a
-    102:102:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):641:641 -> a
-    103:106:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):649:652 -> a
-    107:107:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):670:670 -> a
-    108:109:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):688:689 -> a
-    108:109:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):670 -> a
-    110:110:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):688:688 -> a
-    110:110: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.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):200 -> a
+    85:85:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1341 -> a
+    86:86:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    86:86:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1342 -> a
+    87:91:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1343:1347 -> a
+    92:92:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):495:495 -> a
+    93:93:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):543:543 -> a
+    93:93:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):495 -> a
+    94:94:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):533:533 -> a
+    95:95:com.android.tools.r8.shaking.Enqueuer registerFieldAccessAnalysis(com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):548:548 -> a
+    96:96:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):553:553 -> a
+    97:97:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):563:563 -> a
+    98:98:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):573:573 -> a
+    99:99:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):587:587 -> a
+    100:100:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):594:594 -> a
+    100:100:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):589 -> a
+    101:101:boolean addLiveMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):598:598 -> a
+    102:102:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext):642:642 -> a
+    103:106:void recordMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):650:653 -> a
+    107:107:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):671:671 -> a
+    108:109:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):689:690 -> a
+    108:109:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):671 -> a
+    110:110:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):689:689 -> a
+    110:110: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.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):201 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    111:111:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):689:689 -> a
-    111:111: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.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):200 -> a
-    112:117:com.android.tools.r8.graph.ClassResolutionResult internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):698:703 -> a
-    118:118:void lambda$internalDefinitionFor$2(java.util.function.BiConsumer,com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexClass):701:701 -> a
-    119:121:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):726:728 -> a
+    111:111:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):690:690 -> a
+    111:111: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.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):201 -> a
+    112:117:com.android.tools.r8.graph.ClassResolutionResult internalDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):699:704 -> a
+    118:118:void lambda$internalDefinitionFor$2(java.util.function.BiConsumer,com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexClass):702:702 -> a
+    119:121:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):727:729 -> a
     122:122:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    122:122:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):727 -> a
+    122:122:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):728 -> a
     123:123:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    123:123:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):727 -> a
+    123:123:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):728 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    124:124:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):730:730 -> a
+    124:124:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):731:731 -> a
     125:125:com.android.tools.r8.shaking.KeepFieldInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.asFieldJoinerOrNull(com.android.tools.r8.shaking.KeepInfo$Joiner):515:515 -> a
-    125:125:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):730 -> a
-    126:126:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):731:731 -> a
-    127:132:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):764:769 -> a
-    133:137:void handleLibraryTypeInheritingFromProgramType(com.android.tools.r8.graph.DexLibraryClass):848:852 -> a
-    133:137:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):769 -> a
-    138:163:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):771:796 -> a
-    164:164:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):793:793 -> a
-    165:167:void lambda$processNewLiveNonProgramType$3(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):774:776 -> a
-    168:168:void lambda$processNewLiveNonProgramType$3(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):773:773 -> a
-    169:173:void lambda$processNewLiveNonProgramType$4(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):780:784 -> a
-    174:181:void lambda$processNewLiveNonProgramType$4(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):781:788 -> a
-    182:182:void lambda$processNewLiveNonProgramType$4(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):787:787 -> a
-    183:189:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):806:812 -> a
-    190:190:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):337:337 -> a
-    190:190:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):813 -> a
+    125:125:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):731 -> a
+    126:126:boolean hasMinimumKeepInfoThatMatches(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):732:732 -> a
+    127:132:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):765:770 -> a
+    133:137:void handleLibraryTypeInheritingFromProgramType(com.android.tools.r8.graph.DexLibraryClass):849:853 -> a
+    133:137:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):770 -> a
+    138:163:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):772:797 -> a
+    164:164:void processNewLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,com.android.tools.r8.utils.WorkList,java.util.function.BiConsumer,boolean):794:794 -> a
+    165:167:void lambda$processNewLiveNonProgramType$3(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):775:777 -> a
+    168:168:void lambda$processNewLiveNonProgramType$3(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndField):774:774 -> a
+    169:173:void lambda$processNewLiveNonProgramType$4(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):781:785 -> a
+    174:181:void lambda$processNewLiveNonProgramType$4(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):782:789 -> a
+    182:182:void lambda$processNewLiveNonProgramType$4(java.util.function.BiConsumer,com.android.tools.r8.graph.DexClassAndMethod):788:788 -> a
+    183:189:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):807:813 -> a
+    190:190:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):349:349 -> a
+    190:190:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):814 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    191:191:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):337:337 -> a
-    191:191:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):813 -> a
-    192:196:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):814:818 -> a
-    197:198:void lambda$addNonProgramClassToWorklist$5(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):820:821 -> a
-    199:199:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):917:917 -> a
-    200:200:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    200:200:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):918 -> a
+    191:191:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):349:349 -> a
+    191:191:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):814 -> a
+    192:196:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition,java.util.function.Consumer,java.util.function.BiConsumer):815:819 -> a
+    197:198:void lambda$addNonProgramClassToWorklist$5(java.util.function.Consumer,com.android.tools.r8.graph.DexClass):821:822 -> a
+    199:199:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):918:918 -> a
+    200:200:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    200:200:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):919 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    201:201:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    201:201:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):918 -> a
-    202:206:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):919:923 -> a
-    207:207:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():818:818 -> a
-    207:207:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():804 -> a
-    207:207:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):924 -> a
-    208:212:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):925:929 -> a
-    213:217:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):927:931 -> a
-    218:218:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):858:858 -> a
-    218:218:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):931 -> a
+    201:201:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    201:201:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):919 -> a
+    202:206:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):920:924 -> a
+    207:207:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():832:832 -> a
+    207:207:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():818 -> a
+    207:207:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):925 -> a
+    208:212:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):926:930 -> a
+    213:217:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):928:932 -> a
+    218:218:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):872:872 -> a
+    218:218:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):932 -> a
     219:219:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):451:451 -> a
-    219:219:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):858 -> a
+    219:219:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):872 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    219:219:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):931 -> a
+    219:219:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):932 -> a
     220:220:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):451:451 -> a
-    220:220:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):858 -> a
-    220:220:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):931 -> a
-    221:223:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):932:934 -> a
+    220:220:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):872 -> a
+    220:220:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):932 -> a
+    221:223:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):933:935 -> a
     224:224:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    224:224:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694 -> a
-    224:224:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):933 -> a
-    225:225:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694:3694 -> a
-    225:225:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):933 -> a
-    226:228:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):942:944 -> a
-    226:228:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):900 -> a
+    224:224:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706 -> a
+    224:224:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):934 -> a
+    225:225:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706:3706 -> a
+    225:225:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):934 -> a
+    226:228:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):943:945 -> a
+    226:228:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):901 -> a
     229:229:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getReasons():523:523 -> a
-    229:229:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):948 -> a
+    229:229:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):949 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    229:229:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):900 -> a
+    229:229:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):901 -> a
     230:230:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> a
-    230:230:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):949 -> a
-    230:230:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):900 -> a
-    231:231:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):950:950 -> a
-    231:231:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):900 -> a
-    232:232:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):946:946 -> a
-    232:232:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):900 -> a
-    233:233:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):944:944 -> a
-    233:233:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):900 -> a
-    234:236:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):957:959 -> a
-    234:236:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):902 -> a
+    230:230:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):950 -> a
+    230:230:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):901 -> a
+    231:231:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):951:951 -> a
+    231:231:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):901 -> a
+    232:232:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):947:947 -> a
+    232:232:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):901 -> a
+    233:233:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):945:945 -> a
+    233:233:void lambda$enqueueAllIfNotShrinking$6(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField):901 -> a
+    234:236:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):958:960 -> a
+    234:236:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):903 -> a
     237:237:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> a
-    237:237:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):962 -> a
+    237:237:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):963 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    237:237:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):902 -> a
-    238:238:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):962:962 -> a
-    238:238:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):902 -> a
-    239:239:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):961:961 -> a
-    239:239:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):902 -> a
-    240:240:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):959:959 -> a
-    240:240:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):902 -> a
-    241:244:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1001:1004 -> a
-    245:245:void traceReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1026:1026 -> a
-    246:246:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1014:1014 -> a
-    246:246:void traceReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1027 -> a
-    247:247:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1022:1022 -> a
-    247:247:void traceReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1028 -> a
+    237:237:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):903 -> a
+    238:238:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):963:963 -> a
+    238:238:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):903 -> a
+    239:239:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):962:962 -> a
+    239:239:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):903 -> a
+    240:240:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):960:960 -> a
+    240:240:void lambda$enqueueAllIfNotShrinking$7(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod):903 -> a
+    241:244:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1002:1005 -> a
+    245:245:void traceReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1027:1027 -> a
+    246:246:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1015:1015 -> a
+    246:246:void traceReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1028 -> a
+    247:247:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1023:1023 -> a
+    247:247:void traceReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1029 -> a
     248:248:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    248:248:void traceReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1030 -> a
-    249:249:void traceReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1030:1030 -> a
-    250:292:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1050:1092 -> a
-    293:293:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1098:1098 -> a
-    294:294:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    294:294:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1098 -> a
+    248:248:void traceReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1031 -> a
+    249:249:void traceReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1031:1031 -> a
+    250:257:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1064:1071 -> a
+    258:263:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1051:1056 -> a
+    258:263:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1075 -> a
+    264:284:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):1079:1099 -> a
+    285:285:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1105:1105 -> a
+    286:286:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    286:286:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1105 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    295:295:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    295:295:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1098 -> a
-    296:296:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1098:1098 -> a
-    297:300:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):283:286 -> a
-    297:300:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1098 -> a
-    301:301:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):911:911 -> a
-    301:301:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):286 -> a
+    287:287:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    287:287:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1105 -> a
+    288:288:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1105:1105 -> a
+    289:292:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):283:286 -> a
+    289:292:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1105 -> a
+    293:293:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):911:911 -> a
+    293:293:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):286 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    301:301:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1098 -> a
-    302:302:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):911:911 -> a
-    302:302:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):286 -> a
-    302:302:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1098 -> a
-    303:304:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1099:1100 -> a
-    305:305:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):833:833 -> a
-    305:305:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1100 -> a
-    306:310:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1102:1106 -> a
-    311:311:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> a
-    311:311:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1108 -> a
-    312:313:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1108:1109 -> a
-    314:314:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    314:314:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1109 -> a
-    315:315:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1110:1110 -> a
-    316:316:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
-    316:316:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1111 -> a
+    293:293:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1105 -> a
+    294:294:boolean com.android.tools.r8.graph.DexItemFactory.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):911:911 -> a
+    294:294:boolean com.android.tools.r8.ir.desugar.LambdaDescriptor.isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexDefinitionSupplier):286 -> a
+    294:294:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1105 -> a
+    295:296:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1106:1107 -> a
+    297:297:com.android.tools.r8.graph.DexProgramClass getProgramHolderOrNull(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.ProgramDefinition):834:834 -> a
+    297:297:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1107 -> a
+    298:302:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1109:1113 -> a
+    303:303:java.util.List com.android.tools.r8.graph.DexCallSite.getBootstrapArgs():106:106 -> a
+    303:303:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1115 -> a
+    304:305:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1115:1116 -> a
+    306:306:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
+    306:306:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1116 -> a
+    307:307:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1117:1117 -> a
+    308:308:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
+    308:308:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1118 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    317:317:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
-    317:317:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1111 -> a
-    318:325:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1112:1119 -> a
-    326:326:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2743:2743 -> a
-    326:326:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    327:330:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2750:2753 -> a
-    327:330:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    327:330:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
+    309:309:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():294:294 -> a
+    309:309:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1118 -> a
+    310:317:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1119:1126 -> a
+    318:318:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2755:2755 -> a
+    318:318:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    319:322:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2762:2765 -> a
+    319:322:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    319:322:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    323:323:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":386,"2":387,"3":388}}
+    386:386:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2765:2765 -> a
+    386:386:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    386:386:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    387:387:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2765:2765 -> a
+    387:387:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    387:387:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    388:388:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2765:2765 -> a
+    388:388:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    388:388:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    324:324:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":390,"2":391,"3":392,"4":393}}
+    390:390:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2767:2767 -> a
+    390:390:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    390:390:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    391:391:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2767:2767 -> a
+    391:391:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    391:391:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    392:392:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2767:2767 -> a
+    392:392:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    392:392:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    393:393:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2767:2767 -> a
+    393:393:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    393:393:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    325:330:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2768:2773 -> a
+    325:330:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    325:330:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
     331:331:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":394,"2":395,"3":396}}
-    394:394:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2753:2753 -> a
-    394:394:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    394:394:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    395:395:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2753:2753 -> a
-    395:395:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    395:395:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    396:396:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2753:2753 -> a
-    396:396:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    396:396:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":399,"2":400,"3":401}}
+    399:399:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2773:2773 -> a
+    399:399:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    399:399:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    400:400:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2773:2773 -> a
+    400:400:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    400:400:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    401:401:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2773:2773 -> a
+    401:401:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    401:401:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
     332:332:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":398,"2":399,"3":400,"4":401}}
-    398:398:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2755:2755 -> a
-    398:398:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    398:398:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    399:399:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2755:2755 -> a
-    399:399:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    399:399:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    400:400:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2755:2755 -> a
-    400:400:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    400:400:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    401:401:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2755:2755 -> a
-    401:401:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    401:401:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    333:338:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2756:2761 -> a
-    333:338:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    333:338:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    339:339:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":407,"2":408,"3":409}}
-    407:407:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2761:2761 -> a
-    407:407:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    407:407:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    408:408:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2761:2761 -> a
-    408:408:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    408:408:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    409:409:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2761:2761 -> a
-    409:409:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    409:409:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    340:340:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":413,"2":414,"3":415,"4":416}}
-    413:413:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2765:2765 -> a
-    413:413:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    413:413:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    414:414:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2765:2765 -> a
-    414:414:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    414:414:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    415:415:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2765:2765 -> a
-    415:415:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    415:415:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    416:416:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2765:2765 -> a
-    416:416:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    416:416:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    341:342:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2767:2768 -> a
-    341:342:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2744 -> a
-    341:342:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    343:343:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2745:2745 -> a
-    343:343:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1121 -> a
-    344:344:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):17:17 -> a
-    344:344:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2775 -> a
-    344:344:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1122 -> a
-    345:345:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2775:2775 -> a
-    345:345:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1122 -> a
-    346:346:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2774:2774 -> a
-    346:346:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1122 -> a
-    347:374:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1123:1150 -> a
-    375:375:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    375:375:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1411 -> a
-    375:375:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1138 -> a
-    376:376:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1411:1411 -> a
-    376:376:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1138 -> a
-    377:377:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    377:377:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1390 -> a
-    377:377:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1144 -> a
-    378:378:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1390:1390 -> a
-    378:378:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1144 -> a
-    379:379:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1147:1147 -> a
-    380:380:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1529:1529 -> a
-    380:380:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1147 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":405,"2":406,"3":407,"4":408}}
+    405:405:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2777:2777 -> a
+    405:405:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    405:405:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    406:406:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2777:2777 -> a
+    406:406:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    406:406:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    407:407:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2777:2777 -> a
+    407:407:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    407:407:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    408:408:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2777:2777 -> a
+    408:408:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    408:408:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    333:334:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2779:2780 -> a
+    333:334:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2756 -> a
+    333:334:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    335:335:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2757:2757 -> a
+    335:335:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1128 -> a
+    336:336:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):17:17 -> a
+    336:336:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2787 -> a
+    336:336:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1129 -> a
+    337:337:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2787:2787 -> a
+    337:337:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1129 -> a
+    338:338:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2786:2786 -> a
+    338:338:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1129 -> a
+    339:366:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1130:1157 -> a
+    367:367:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    367:367:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1418 -> a
+    367:367:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1145 -> a
+    368:368:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1418:1418 -> a
+    368:368:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1145 -> a
+    369:369:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    369:369:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1397 -> a
+    369:369:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1151 -> a
+    370:370:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1397:1397 -> a
+    370:370:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1151 -> a
+    371:371:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1154:1154 -> a
+    372:372:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1536:1536 -> a
+    372:372:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1154 -> a
+    373:373:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    373:373:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1537 -> a
+    373:373:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1154 -> a
+    374:374: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):1545:1545 -> a
+    374:374:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1536 -> a
+    374:374:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1154 -> a
+    375:375:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    375:375: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):1547 -> a
+    375:375:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1536 -> a
+    375:375:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1154 -> a
+    376:379: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):1547:1550 -> a
+    376:379:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1536 -> a
+    376:379:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1154 -> a
+    380:380: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):1548:1548 -> a
+    380:380:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1536 -> a
+    380:380:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1154 -> a
     381:381:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    381:381:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1530 -> a
-    381:381:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1147 -> a
-    382:382: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):1538:1538 -> a
-    382:382:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1529 -> a
-    382:382:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1147 -> a
-    383:383:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    383:383: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):1540 -> a
-    383:383:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1529 -> a
-    383:383:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1147 -> a
-    384:387: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):1540:1543 -> a
-    384:387:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1529 -> a
-    384:387:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1147 -> a
-    388:388: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):1541:1541 -> a
-    388:388:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1529 -> a
-    388:388:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1147 -> a
-    389:389:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    389:389:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1487 -> a
-    389:389:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1141 -> a
-    390:390:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1487:1487 -> a
-    390:390:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1141 -> a
-    391:391:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
-    391:391:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1432 -> a
-    391:391:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1135 -> a
-    392:392:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1432:1432 -> a
-    392:392:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1135 -> a
-    393:393:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1153:1153 -> a
-    417:417:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$8(com.android.tools.r8.graph.DexCallSite):1123:1123 -> a
-    418:418:void lambda$traceCallSite$9(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1124:1124 -> a
-    419:423:void lambda$disableClosedWorldReasoning$10(com.android.tools.r8.graph.MethodResolutionResult):1160:1164 -> a
-    424:424:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    424:424:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694 -> a
-    424:424:void lambda$disableClosedWorldReasoning$10(com.android.tools.r8.graph.MethodResolutionResult):1162 -> a
-    425:425:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694:3694 -> a
-    425:425:void lambda$disableClosedWorldReasoning$10(com.android.tools.r8.graph.MethodResolutionResult):1162 -> a
-    426:426:void lambda$traceCheckCast$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1170:1170 -> a
-    427:431:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1194:1198 -> a
-    427:431:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1184 -> a
-    432:432:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1185:1185 -> a
-    433:445:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1214:1226 -> a
-    446:446:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1693:1693 -> a
-    446:446:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1227 -> a
+    381:381:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1494 -> a
+    381:381:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1148 -> a
+    382:382:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1494:1494 -> a
+    382:382:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1148 -> a
+    383:383:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):58:58 -> a
+    383:383:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1439 -> a
+    383:383:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1142 -> a
+    384:384:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1439:1439 -> a
+    384:384:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1142 -> a
+    385:385:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1160:1160 -> a
+    409:409:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$8(com.android.tools.r8.graph.DexCallSite):1130:1130 -> a
+    410:410:void lambda$traceCallSite$9(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):1131:1131 -> a
+    411:415:void lambda$disableClosedWorldReasoning$10(com.android.tools.r8.graph.MethodResolutionResult):1167:1171 -> a
+    416:416:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    416:416:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706 -> a
+    416:416:void lambda$disableClosedWorldReasoning$10(com.android.tools.r8.graph.MethodResolutionResult):1169 -> a
+    417:417:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706:3706 -> a
+    417:417:void lambda$disableClosedWorldReasoning$10(com.android.tools.r8.graph.MethodResolutionResult):1169 -> a
+    418:418:void lambda$traceCheckCast$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1177:1177 -> a
+    419:423:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1201:1205 -> a
+    419:423:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1191 -> a
+    424:424:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator,boolean):1192:1192 -> a
+    425:437:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1221:1233 -> a
+    438:438:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1693:1693 -> a
+    438:438:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1234 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    447:447:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1693:1693 -> a
-    447:447:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1227 -> a
-    448:455:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1227:1234 -> a
-    456:456:boolean lambda$isConstClassMaybeUsedAsLock$13(com.android.tools.r8.dex.code.CfOrDexInstruction):1219:1219 -> a
-    457:457:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    457:457:boolean lambda$isConstClassMaybeUsedAsLock$13(com.android.tools.r8.dex.code.CfOrDexInstruction):1219 -> a
-    458:458:boolean lambda$isConstClassMaybeUsedAsLock$13(com.android.tools.r8.dex.code.CfOrDexInstruction):1220:1220 -> a
-    459:459:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    459:459:boolean lambda$isConstClassMaybeUsedAsLock$13(com.android.tools.r8.dex.code.CfOrDexInstruction):1220 -> a
-    460:460:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1251:1251 -> a
-    461:461:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1348:1348 -> a
-    461:461:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1241 -> a
-    462:470:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1242:1250 -> a
-    471:477:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1378:1384 -> a
-    478:478:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1380:1380 -> a
-    479:479:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$19(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):1382:1382 -> a
-    480:480:boolean lambda$registerDeferredActionForDeadProtoBuilder$18(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1383:1383 -> a
-    481:483:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1395:1395 -> a
-    487:488:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1399:1400 -> a
-    489:489:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    489:489:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1400 -> a
-    490:521:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2483:2514 -> a
-    490:521:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1402 -> a
-    522:522:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1403:1403 -> a
-    523:523:void lambda$traceInvokeDirect$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1403:1403 -> a
-    524:524:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1651:1651 -> a
-    525:525:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1010:1010 -> a
-    525:525:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1651 -> a
-    526:533:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1655:1662 -> a
-    534:534:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):124:124 -> a
-    534:534:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1662 -> a
-    535:546:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1664:1675 -> a
-    547:547:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2246,"2":2247,"3":2248}}
-    2246:2246:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1675:1675 -> a
-    2247:2247:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1675:1675 -> a
-    2248:2248:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1675:1675 -> a
-    2224:2235:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1677:1688 -> a
-    2236:2236:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2236:2236:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1688 -> a
-    2237:2239:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1691:1693 -> a
-    2240:2242:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1999:2001 -> a
-    2240:2242:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1693 -> a
-    2243:2243:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1696:1696 -> a
-    2244:2244:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
-    2244:2244:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1697 -> a
-    2245:2245:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1696:1696 -> a
-    2249:2249:void lambda$traceInstanceFieldRead$26(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1666:1666 -> a
-    2250:2250:java.lang.Boolean lambda$traceStaticFieldRead$32(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1794:1794 -> a
-    2251:2252:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.isDeadProtoExtensionField(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):245:246 -> a
-    2251:2252:java.lang.Boolean lambda$traceStaticFieldRead$32(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1794 -> a
-    2253:2253:java.lang.Boolean lambda$traceStaticFieldRead$32(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1794:1794 -> a
-    2254:2254:void lambda$traceStaticFieldRead$35(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1852:1852 -> a
-    2255:2267:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1983:1995 -> a
-    2268:2272:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2020:2024 -> a
-    2273:2273:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isFinalMainDexTracing():227:227 -> a
-    2273:2273:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2024 -> a
-    2274:2277:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2024:2024 -> a
-    2278:2278:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4460,"2":4461,"3":4462}}
-    4460:4460:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2024:2024 -> a
-    4461:4461:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2024:2024 -> a
-    4462:4462:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2024:2024 -> a
-    4305:4307:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2027:2029 -> a
-    4308:4308:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):28:28 -> a
-    4308:4308:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2029 -> a
-    4309:4319:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2029:2039 -> a
-    4320:4326:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2038:2044 -> a
-    4327:4363:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2043:2079 -> a
-    4364:4364:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    4364:4364:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2079 -> a
-    4365:4365:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2082:2082 -> a
-    4366:4366:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
-    4366:4366:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2082 -> a
-    4367:4376:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2084:2093 -> a
-    4377:4380:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):857:860 -> a
-    4377:4380:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2097 -> a
-    4381:4381:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4463,"2":4464,"3":4465}}
-    4463:4463:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):860:860 -> a
-    4463:4463:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2097 -> a
-    4464:4464:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):860:860 -> a
-    4464:4464:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2097 -> a
-    4465:4465:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):860:860 -> a
-    4465:4465:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2097 -> a
-    4382:4384:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):863:865 -> a
-    4382:4384:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2097 -> a
-    4385:4397:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):860:872 -> a
-    4385:4397:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2097 -> a
-    4398:4398:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4477,"2":4478,"3":4479}}
-    4477:4477:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):872:872 -> a
-    4477:4477:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2097 -> a
-    4478:4478:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):872:872 -> a
-    4478:4478:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2097 -> a
-    4479:4479:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):872:872 -> a
-    4479:4479:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2097 -> a
-    4399:4401:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):875:877 -> a
-    4399:4401:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2097 -> a
-    4402:4402:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):872:872 -> a
-    4402:4402:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2097 -> a
-    4403:4406:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3040:3043 -> a
-    4403:4406:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2101 -> a
-    4407:4407:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2006:2006 -> a
-    4407:4407:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3044 -> a
-    4407:4407:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2101 -> a
-    4408:4408:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3048:3048 -> a
-    4408:4408:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2101 -> a
-    4409:4411:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2118:2120 -> a
-    4412:4412:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854:854 -> a
-    4412:4412:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2120 -> a
-    4413:4413:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
-    4413:4413:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854 -> a
+    439:439:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1693:1693 -> a
+    439:439:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1234 -> a
+    440:447:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1234:1241 -> a
+    448:448:boolean lambda$isConstClassMaybeUsedAsLock$13(com.android.tools.r8.dex.code.CfOrDexInstruction):1226:1226 -> a
+    449:449:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    449:449:boolean lambda$isConstClassMaybeUsedAsLock$13(com.android.tools.r8.dex.code.CfOrDexInstruction):1226 -> a
+    450:450:boolean lambda$isConstClassMaybeUsedAsLock$13(com.android.tools.r8.dex.code.CfOrDexInstruction):1227:1227 -> a
+    451:451:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    451:451:boolean lambda$isConstClassMaybeUsedAsLock$13(com.android.tools.r8.dex.code.CfOrDexInstruction):1227 -> a
+    452:452:com.android.tools.r8.shaking.KeepReason lambda$internalTraceConstClassOrCheckCast$14(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):1258:1258 -> a
+    453:453:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1355:1355 -> a
+    453:453:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1248 -> a
+    454:462:void internalTraceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1249:1257 -> a
+    463:469:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1385:1391 -> a
+    470:470:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1387:1387 -> a
+    471:471:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$19(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):1389:1389 -> a
+    472:472:boolean lambda$registerDeferredActionForDeadProtoBuilder$18(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1390:1390 -> a
+    473:475:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1402:1402 -> a
+    479:480:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1406:1407 -> a
+    481:481:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    481:481:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1407 -> a
+    482:513:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2495:2526 -> a
+    482:513:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1409 -> a
+    514:514:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1410:1410 -> a
+    515:515:void lambda$traceInvokeDirect$20(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1410:1410 -> a
+    516:516:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1658:1658 -> a
+    517:517:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1011:1011 -> a
+    517:517:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1658 -> a
+    518:525:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1662:1669 -> a
+    526:526:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):124:124 -> a
+    526:526:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1669 -> a
+    527:538:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1671:1682 -> a
+    539:539:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2245,"2":2246,"3":2247}}
+    2245:2245:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1682:1682 -> a
+    2246:2246:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1682:1682 -> a
+    2247:2247:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1682:1682 -> a
+    2223:2234:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1684:1695 -> a
+    2235:2235:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2235:2235:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1695 -> a
+    2236:2238:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1698:1700 -> a
+    2239:2241:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2006:2008 -> a
+    2239:2241:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1700 -> a
+    2242:2242:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1703:1703 -> a
+    2243:2243:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> a
+    2243:2243:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1704 -> a
+    2244:2244:void lambda$traceInstanceFieldRead$27(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1703:1703 -> a
+    2248:2248:void lambda$traceInstanceFieldRead$26(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1673:1673 -> a
+    2249:2249:java.lang.Boolean lambda$traceStaticFieldRead$32(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1801:1801 -> a
+    2250:2251:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.isDeadProtoExtensionField(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):245:246 -> a
+    2250:2251:java.lang.Boolean lambda$traceStaticFieldRead$32(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1801 -> a
+    2252:2252:java.lang.Boolean lambda$traceStaticFieldRead$32(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1801:1801 -> a
+    2253:2253:void lambda$traceStaticFieldRead$35(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1859:1859 -> a
+    2254:2266:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):1990:2002 -> a
+    2267:2271:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2027:2031 -> a
+    2272:2272:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isFinalMainDexTracing():228:228 -> a
+    2272:2272:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2031 -> a
+    2273:2276:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2031:2031 -> a
+    2277:2277:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4475,"2":4476,"3":4477}}
+    4475:4475:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2031:2031 -> a
+    4476:4476:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2031:2031 -> a
+    4477:4477:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2031:2031 -> a
+    4311:4313:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2034:2036 -> a
+    4314:4314:boolean com.android.tools.r8.ir.optimize.enums.EnumDataMap.isUnboxedEnum(com.android.tools.r8.graph.DexProgramClass):50:50 -> a
+    4314:4314:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2036 -> a
+    4315:4317:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2036:2038 -> a
+    4318:4318:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    4318:4318:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2038 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4413:4413:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2120 -> a
-    4414:4414:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
-    4414:4414:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854 -> a
-    4414:4414:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2120 -> a
-    4415:4415:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):967:967 -> a
-    4415:4415:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4416:4416:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854:854 -> a
-    4416:4416:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):967 -> a
-    4416:4416:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4417:4417:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
-    4417:4417:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854 -> a
+    4319:4319:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    4319:4319:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2038 -> a
+    4320:4321:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2038:2039 -> a
+    4322:4322:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
+    4322:4322:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2041 -> a
+    4323:4323:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    4323:4323:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    4323:4323:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2041 -> a
+    4324:4334:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2041:2051 -> a
+    4335:4341:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2050:2056 -> a
+    4342:4378:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2055:2091 -> a
+    4379:4379:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    4379:4379:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2091 -> a
+    4380:4380:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2094:2094 -> a
+    4381:4381:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
+    4381:4381:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2094 -> a
+    4382:4391:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2096:2105 -> a
+    4392:4395:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):858:861 -> a
+    4392:4395:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2109 -> a
+    4396:4396:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4478,"2":4479,"3":4480}}
+    4478:4478:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):861:861 -> a
+    4478:4478:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2109 -> a
+    4479:4479:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):861:861 -> a
+    4479:4479:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2109 -> a
+    4480:4480:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):861:861 -> a
+    4480:4480:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2109 -> a
+    4397:4399:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):864:866 -> a
+    4397:4399:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2109 -> a
+    4400:4412:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):861:873 -> a
+    4400:4412:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2109 -> a
+    4413:4413:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4492,"2":4493,"3":4494}}
+    4492:4492:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):873:873 -> a
+    4492:4492:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2109 -> a
+    4493:4493:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):873:873 -> a
+    4493:4493:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2109 -> a
+    4494:4494:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):873:873 -> a
+    4494:4494:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2109 -> a
+    4414:4416:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):876:878 -> a
+    4414:4416:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2109 -> a
+    4417:4417:void warnIfClassExtendsInterfaceOrImplementsClass(com.android.tools.r8.graph.DexProgramClass):873:873 -> a
+    4417:4417:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2109 -> a
+    4418:4421:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3052:3055 -> a
+    4418:4421:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2113 -> a
+    4422:4422:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2013:2013 -> a
+    4422:4422:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3056 -> a
+    4422:4422:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2113 -> a
+    4423:4423:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):3060:3060 -> a
+    4423:4423:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2113 -> a
+    4424:4426:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2130:2132 -> a
+    4427:4427:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868:868 -> a
+    4427:4427:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2132 -> a
+    4428:4428:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
+    4428:4428:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4417:4417:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):967 -> a
-    4417:4417:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4418:4418:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
-    4418:4418:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854 -> a
-    4418:4418:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):967 -> a
-    4418:4418:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4419:4422:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):967:970 -> a
-    4419:4422:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4423:4423:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854:854 -> a
-    4423:4423:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):970 -> a
-    4423:4423:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4424:4424:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
-    4424:4424:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854 -> a
+    4428:4428:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2132 -> a
+    4429:4429:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
+    4429:4429:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868 -> a
+    4429:4429:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2132 -> a
+    4430:4430:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):968:968 -> a
+    4430:4430:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4431:4431:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868:868 -> a
+    4431:4431:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):968 -> a
+    4431:4431:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4432:4432:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
+    4432:4432:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4424:4424:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):970 -> a
-    4424:4424:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4425:4425:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
-    4425:4425:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854 -> a
-    4425:4425:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):970 -> a
-    4425:4425:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4426:4426:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):971:971 -> a
-    4426:4426:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4427:4427:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():818:818 -> a
-    4427:4427:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():804 -> a
-    4427:4427:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):977 -> a
-    4427:4427:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4428:4431:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):978:981 -> a
-    4428:4431:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4432:4432:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    4432:4432:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694 -> a
-    4432:4432:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):979 -> a
-    4432:4432:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4433:4433:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694:3694 -> a
-    4433:4433:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):979 -> a
-    4433:4433:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2121 -> a
-    4434:4436:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2125:2127 -> a
-    4437:4437:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():713:713 -> a
-    4437:4437:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2128 -> a
-    4438:4438:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2128:2128 -> a
-    4439:4439:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2241:2241 -> a
-    4439:4439:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2131 -> a
-    4440:4440:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
-    4440:4440:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2242 -> a
-    4440:4440:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2131 -> a
-    4441:4441:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2247:2247 -> a
-    4441:4441:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2239 -> a
-    4441:4441:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2131 -> a
-    4442:4443:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2252:2253 -> a
-    4442:4443:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2247 -> a
-    4442:4443:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2239 -> a
-    4442:4443:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2131 -> a
-    4444:4444:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    4444:4444:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2134 -> a
-    4445:4451:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2135:2141 -> a
-    4452:4452:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1693:1693 -> a
-    4452:4452:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2141 -> a
+    4432:4432:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):968 -> a
+    4432:4432:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4433:4433:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
+    4433:4433:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868 -> a
+    4433:4433:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):968 -> a
+    4433:4433:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4434:4437:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):968:971 -> a
+    4434:4437:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4438:4438:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868:868 -> a
+    4438:4438:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):971 -> a
+    4438:4438:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4439:4439:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
+    4439:4439:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4453:4453:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1693:1693 -> a
-    4453:4453:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2141 -> a
-    4454:4458:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):987:991 -> a
-    4454:4458:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2140 -> a
-    4459:4459:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2143:2143 -> a
-    4480:4480:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$markTypeAsLive$43(com.android.tools.r8.graph.ProgramDefinition):2137:2137 -> a
-    4481:4481:void lambda$markTypeAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2143:2143 -> a
-    4482:4485:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):2151:2154 -> a
-    4486:4488:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):2153:2155 -> a
-    4489:4489:boolean lambda$processDeferredAnnotations$45(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):2154:2154 -> a
-    4490:4490:void lambda$processDeferredAnnotations$47(java.util.function.Function,com.android.tools.r8.graph.DexAnnotation,java.util.List):2157:2157 -> a
-    4491:4491:void lambda$processDeferredAnnotations$46(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):2160:2160 -> a
-    4492:4492:void lambda$processDeferredAnnotations$46(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):2159:2159 -> a
-    4493:4496:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2165:2168 -> a
-    4497:4499:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2167:2169 -> a
-    4500:4500:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):154:154 -> a
-    4500:4500:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2169 -> a
-    4501:4501:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):154:154 -> a
-    4501:4501:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2169 -> a
+    4439:4439:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):971 -> a
+    4439:4439:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4440:4440:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
+    4440:4440:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868 -> a
+    4440:4440:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):971 -> a
+    4440:4440:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4441:4441:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):972:972 -> a
+    4441:4441:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4442:4442:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():832:832 -> a
+    4442:4442:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():818 -> a
+    4442:4442:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):978 -> a
+    4442:4442:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4443:4446:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):979:982 -> a
+    4443:4446:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4447:4447:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    4447:4447:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706 -> a
+    4447:4447:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):980 -> a
+    4447:4447:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4448:4448:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706:3706 -> a
+    4448:4448:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):980 -> a
+    4448:4448:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2133 -> a
+    4449:4451:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2137:2139 -> a
+    4452:4452:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():714:714 -> a
+    4452:4452:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2140 -> a
+    4453:4453:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2140:2140 -> a
+    4454:4454:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2253:2253 -> a
+    4454:4454:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2143 -> a
+    4455:4455:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
+    4455:4455:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2254 -> a
+    4455:4455:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2143 -> a
+    4456:4456:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2259:2259 -> a
+    4456:4456:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2251 -> a
+    4456:4456:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2143 -> a
+    4457:4458:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2264:2265 -> a
+    4457:4458:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2259 -> a
+    4457:4458:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2251 -> a
+    4457:4458:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2143 -> a
+    4459:4459:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    4459:4459:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2146 -> a
+    4460:4466:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2147:2153 -> a
+    4467:4467:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1790:1790 -> a
+    4467:4467:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2153 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4502:4502:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):2174:2174 -> a
-    4503:4505:boolean lambda$ensureMethodsContinueToWidenAccess$49(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2176:2178 -> a
-    4506:4506:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):518:518 -> a
-    4506:4506:boolean lambda$ensureMethodsContinueToWidenAccess$49(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2178 -> a
+    4468:4468:java.util.Set com.android.tools.r8.shaking.RootSetUtils$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1790:1790 -> a
+    4468:4468:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2153 -> a
+    4469:4473:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):988:992 -> a
+    4469:4473:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2152 -> a
+    4474:4474:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2155:2155 -> a
+    4495:4495:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind lambda$markTypeAsLive$43(com.android.tools.r8.graph.ProgramDefinition):2149:2149 -> a
+    4496:4496:void lambda$markTypeAsLive$44(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2155:2155 -> a
+    4497:4500:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):2163:2166 -> a
+    4501:4503:void processDeferredAnnotations(com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.function.Function):2165:2167 -> a
+    4504:4504:boolean lambda$processDeferredAnnotations$45(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):2166:2166 -> a
+    4505:4505:void lambda$processDeferredAnnotations$47(java.util.function.Function,com.android.tools.r8.graph.DexAnnotation,java.util.List):2169:2169 -> a
+    4506:4506:void lambda$processDeferredAnnotations$46(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):2172:2172 -> a
+    4507:4507:void lambda$processDeferredAnnotations$46(com.android.tools.r8.graph.DexAnnotation,java.util.function.Function,com.android.tools.r8.graph.ProgramDefinition):2171:2171 -> a
+    4508:4511:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2177:2180 -> a
+    4512:4514:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2179:2181 -> a
+    4515:4515:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):154:154 -> a
+    4515:4515:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2181 -> a
+    4516:4516:void com.android.tools.r8.graph.MethodCollection.forEachVirtualMethod(java.util.function.Consumer):154:154 -> a
+    4516:4516:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.ClassDefinition):2181 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4510:4511:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):522:523 -> a
-    4510:4511:boolean lambda$ensureMethodsContinueToWidenAccess$49(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2178 -> a
-    4512:4515:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2259:2262 -> a
-    4516:4521:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2292:2297 -> a
-    4516:4521:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2263 -> a
-    4522:4522:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2267:2267 -> a
-    4523:4523:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():48:48 -> a
-    4523:4523:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2267 -> a
-    4524:4541:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2267:2284 -> a
-    4542:4542:java.util.List lambda$processAnnotation$53(com.android.tools.r8.graph.DexAnnotation):2271:2271 -> a
-    4543:4544:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2303:2304 -> a
-    4545:4545:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):124:124 -> a
-    4545:4545:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2304 -> a
+    4517:4517:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):2186:2186 -> a
+    4518:4520:boolean lambda$ensureMethodsContinueToWidenAccess$49(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2188:2190 -> a
+    4521:4521:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):518:518 -> a
+    4521:4521:boolean lambda$ensureMethodsContinueToWidenAccess$49(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2190 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4546:4546:void lambda$resolveField$54(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2307:2307 -> a
-    4547:4548:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):657:658 -> a
-    4547:4548:void lambda$resolveField$54(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2306 -> a
-    4549:4549:void lambda$resolveField$55(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2310:2310 -> a
-    4550:4551:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):657:658 -> a
-    4550:4551:void lambda$resolveField$55(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2311 -> a
-    4552:4552:void lambda$resolveMethod$56(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.MethodResolutionResult):2322:2322 -> a
-    4553:4553:void lambda$resolveMethod$57(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):2325:2325 -> a
-    4554:4556:void lambda$resolveMethod$57(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):2324:2326 -> a
-    4557:4559:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2334:2336 -> a
-    4560:4562:void lambda$resolveMethod$58(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):2338:2340 -> a
-    4563:4568:void lambda$resolveMethod$58(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):2339:2344 -> a
-    4569:4571:void lambda$resolveMethod$58(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):2343:2345 -> a
-    4572:4573:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2354:2355 -> a
-    4574:4592:void lambda$handleInvokeOfStaticTarget$59(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):2357:2375 -> a
-    4593:4616:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2519:2542 -> a
-    4617:4617:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
-    4617:4617:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2542 -> a
-    4618:4628:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2543:2553 -> a
-    4629:4629:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.Definition):27:27 -> a
-    4629:4629:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2553 -> a
-    4630:4631:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2558:2559 -> a
-    4632:4632:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7202,"2":7203,"3":7204}}
-    7202:7202:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2559:2559 -> a
-    7203:7203:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2559:2559 -> a
-    7204:7204:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2559:2559 -> a
-    7191:7201:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2559:2569 -> a
-    7205:7207:void lambda$ensureFromLibraryOrThrow$60(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2547:2549 -> a
-    7208:7210:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2581:2583 -> a
-    7211:7211:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2575:2575 -> a
-    7211:7211:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2584 -> a
-    7212:7212:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():670:670 -> a
-    7212:7212:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2575 -> a
+    4525:4526:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):522:523 -> a
+    4525:4526:boolean lambda$ensureMethodsContinueToWidenAccess$49(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):2190 -> a
+    4527:4530:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2271:2274 -> a
+    4531:4536:boolean shouldKeepAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind,boolean):2304:2309 -> a
+    4531:4536:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2275 -> a
+    4537:4537:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2279:2279 -> a
+    4538:4538:boolean com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.isParameter():48:48 -> a
+    4538:4538:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2279 -> a
+    4539:4556:void processAnnotation(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2279:2296 -> a
+    4557:4557:java.util.List lambda$processAnnotation$53(com.android.tools.r8.graph.DexAnnotation):2283:2283 -> a
+    4558:4559:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2315:2316 -> a
+    4560:4560:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):124:124 -> a
+    4560:4560:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition):2316 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7212:7212:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2584 -> a
-    7213:7213:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2576:2576 -> a
-    7213:7213:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2584 -> a
-    7214:7214:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2585:2585 -> a
-    7215:7215:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> a
-    7215:7215:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2585 -> a
-    7216:7216:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2591:2591 -> a
-    7217:7217:void lambda$keepClassAndAllMembers$62(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2587:2587 -> a
-    7218:7218:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2575:2575 -> a
-    7218:7218:void lambda$keepClassAndAllMembers$62(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2588 -> a
-    7219:7219:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():670:670 -> a
-    7219:7219:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2575 -> a
+    4561:4561:void lambda$resolveField$54(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2319:2319 -> a
+    4562:4563:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):658:659 -> a
+    4562:4563:void lambda$resolveField$54(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):2318 -> a
+    4564:4564:void lambda$resolveField$55(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2322:2322 -> a
+    4565:4566:void recordFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDerivedContext):658:659 -> a
+    4565:4566:void lambda$resolveField$55(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):2323 -> a
+    4567:4567:void lambda$resolveMethod$56(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.MethodResolutionResult):2334:2334 -> a
+    4568:4568:void lambda$resolveMethod$57(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):2337:2337 -> a
+    4569:4571:void lambda$resolveMethod$57(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult):2336:2338 -> a
+    4572:4574:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,boolean):2346:2348 -> a
+    4575:4577:void lambda$resolveMethod$58(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):2350:2352 -> a
+    4578:4583:void lambda$resolveMethod$58(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):2351:2356 -> a
+    4584:4586:void lambda$resolveMethod$58(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):2355:2357 -> a
+    4587:4588:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2366:2367 -> a
+    4589:4607:void lambda$handleInvokeOfStaticTarget$59(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):2369:2387 -> a
+    4608:4631:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2531:2554 -> a
+    4632:4632:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
+    4632:4632:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2554 -> a
+    4633:4643:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2555:2565 -> a
+    4644:4644:boolean com.android.tools.r8.errors.dontwarn.DontWarnConfiguration.matches(com.android.tools.r8.graph.Definition):27:27 -> a
+    4644:4644:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2565 -> a
+    4645:4646:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2570:2571 -> a
+    4647:4647:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7229,"2":7230,"3":7231}}
+    7229:7229:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2571:2571 -> a
+    7230:7230:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2571:2571 -> a
+    7231:7231:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2571:2571 -> a
+    7218:7228:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexLibraryClass):2571:2581 -> a
+    7232:7234:void lambda$ensureFromLibraryOrThrow$60(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,java.lang.Boolean):2559:2561 -> a
+    7235:7237:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2593:2595 -> a
+    7238:7238:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2587:2587 -> a
+    7238:7238:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2596 -> a
+    7239:7239:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():675:675 -> a
+    7239:7239:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2587 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7219:7219:void lambda$keepClassAndAllMembers$62(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2588 -> a
-    7220:7220:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2576:2576 -> a
-    7220:7220:void lambda$keepClassAndAllMembers$62(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2588 -> a
-    7221:7221:void lambda$keepClassAndAllMembers$62(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2589:2589 -> a
-    7222:7222:void lambda$keepClassAndAllMembers$63(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2593:2593 -> a
-    7223:7223:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2575:2575 -> a
-    7223:7223:void lambda$keepClassAndAllMembers$63(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2594 -> a
-    7224:7224:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():670:670 -> a
-    7224:7224:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2575 -> a
+    7239:7239:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2596 -> a
+    7240:7240:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2588:2588 -> a
+    7240:7240:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2596 -> a
+    7241:7241:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2597:2597 -> a
+    7242:7242:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> a
+    7242:7242:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2597 -> a
+    7243:7243:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2603:2603 -> a
+    7244:7244:void lambda$keepClassAndAllMembers$62(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2599:2599 -> a
+    7245:7245:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2587:2587 -> a
+    7245:7245:void lambda$keepClassAndAllMembers$62(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2600 -> a
+    7246:7246:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():675:675 -> a
+    7246:7246:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2587 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7224:7224:void lambda$keepClassAndAllMembers$63(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2594 -> a
-    7225:7225:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2576:2576 -> a
-    7225:7225:void lambda$keepClassAndAllMembers$63(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2594 -> a
-    7226:7226:void lambda$keepClassAndAllMembers$63(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2595:2595 -> a
-    7227:7229:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2600:2602 -> a
-    7230:7232:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1999:2001 -> a
-    7230:7232:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2602 -> a
-    7233:7233:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2605:2605 -> a
-    7234:7234:void lambda$recordNonProgramClass$64(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2615:2615 -> a
-    7235:7235:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2628:2628 -> a
-    7235:7235:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2632 -> a
-    7235:7235:void access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):200 -> a
+    7246:7246:void lambda$keepClassAndAllMembers$62(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2600 -> a
+    7247:7247:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2588:2588 -> a
+    7247:7247:void lambda$keepClassAndAllMembers$62(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2600 -> a
+    7248:7248:void lambda$keepClassAndAllMembers$62(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2601:2601 -> a
+    7249:7249:void lambda$keepClassAndAllMembers$63(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2605:2605 -> a
+    7250:7250:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2587:2587 -> a
+    7250:7250:void lambda$keepClassAndAllMembers$63(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2606 -> a
+    7251:7251:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():675:675 -> a
+    7251:7251:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2587 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    7251:7251:void lambda$keepClassAndAllMembers$63(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2606 -> a
+    7252:7252:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2588:2588 -> a
+    7252:7252:void lambda$keepClassAndAllMembers$63(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2606 -> a
+    7253:7253:void lambda$keepClassAndAllMembers$63(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2607:2607 -> a
+    7254:7256:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2612:2614 -> a
+    7257:7259:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2006:2008 -> a
+    7257:7259:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2614 -> a
+    7260:7260:void recordFoundClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2617:2617 -> a
+    7261:7261:void lambda$recordNonProgramClass$64(com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2627:2627 -> a
+    7262:7262:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2640:2640 -> a
+    7262:7262:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2644 -> a
+    7262:7262:void access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):201 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    7236:7236:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2628:2628 -> a
-    7236:7236:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2632 -> a
-    7236:7236:void access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):200 -> a
-    7237:7237:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2628:2628 -> a
-    7237:7237:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2632 -> a
-    7238:7238:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2628:2628 -> a
-    7238:7238:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2636 -> a
-    7238:7238:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2641 -> a
-    7239:7239: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):2681:2681 -> a
-    7240:7240:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    7240:7240: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):2681 -> a
+    7263:7263:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2640:2640 -> a
+    7263:7263:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2644 -> a
+    7263:7263:void access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):201 -> a
+    7264:7264:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2640:2640 -> a
+    7264:7264:void ignoreMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2644 -> a
+    7265:7265:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2640:2640 -> a
+    7265:7265:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType):2648 -> a
+    7265:7265:void ignoreMissingClasspathOrLibraryClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ClasspathOrLibraryDefinition):2653 -> a
+    7266:7266: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):2693:2693 -> a
+    7267:7267:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    7267:7267: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):2693 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7241:7241:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    7241:7241: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):2681 -> a
-    7242:7248: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):2681:2687 -> a
-    7249:7250: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):2717:2718 -> a
-    7249:7250: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):2691 -> a
-    7251:7252: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):2695:2696 -> a
-    7253:7253:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    7253:7253: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):2696 -> a
-    7254:7256: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):2699:2701 -> a
-    7257:7257:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    7257:7257:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2779 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7257:7257: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):2704 -> a
-    7258:7258:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    7258:7258:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2779 -> a
-    7258:7258: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):2704 -> a
-    7259:7260:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2779:2780 -> a
-    7259:7260: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):2704 -> a
-    7261:7261:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
-    7261:7261:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2782 -> a
-    7261:7261: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):2704 -> a
-    7262:7262:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2782:2782 -> a
-    7262:7262: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):2704 -> a
-    7263:7263:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2781:2781 -> a
-    7263:7263: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):2704 -> a
-    7264:7267:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2973:2976 -> a
-    7264:7267: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):2706 -> a
-    7268:7268:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
-    7268:7268:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2976 -> a
-    7268:7268: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):2706 -> a
-    7269:7277:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2977:2985 -> a
-    7269:7277: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):2706 -> a
-    7278:7278:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2989:2989 -> a
-    7278:7278: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):2708 -> a
-    7279:7279:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    7279:7279:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2989 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7279:7279: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):2708 -> a
-    7280:7280:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    7280:7280:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2989 -> a
+    7268:7268:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    7268:7268: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):2693 -> a
+    7269:7275: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):2693:2699 -> a
+    7276:7277: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):2729:2730 -> a
+    7276:7277: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):2703 -> a
+    7278:7279: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):2707:2708 -> a
+    7280:7280:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
     7280:7280: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):2708 -> a
-    7281:7283:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2989:2991 -> a
-    7281:7283: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):2708 -> a
-    7284:7284:void lambda$processNewlyInstantiatedClass$65(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2689:2689 -> a
-    7285:7285:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2723:2723 -> a
-    7286:7286:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    7286:7286:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2723 -> a
+    7281:7283: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):2711:2713 -> a
+    7284:7284:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    7284:7284:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2791 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7287:7287:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    7287:7287:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2723 -> a
-    7288:7292:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2723:2727 -> a
-    7293:7294:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2995:2996 -> a
-    7293:7294:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2728 -> a
-    7295:7303:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2794:2802 -> a
-    7304:7318:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2885:2899 -> a
-    7304:7318:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2804 -> a
-    7319:7319:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2896:2896 -> a
-    7319:7319:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2804 -> a
-    7320:7320:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    7320:7320:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2906 -> a
-    7320:7320:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2804 -> a
-    7321:7323:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2906:2908 -> a
-    7321:7323:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2804 -> a
-    7324:7328:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2907:2911 -> a
-    7324:7328:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2804 -> a
-    7329:7335:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2910:2916 -> a
-    7329:7335:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2804 -> a
-    7336:7336:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2913:2913 -> a
-    7336:7336:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2804 -> a
-    7337:7340:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2806:2809 -> a
-    7341:7341:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2820:2820 -> a
-    7342:7342:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
-    7342:7342:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2820 -> a
-    7343:7345:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2820:2820 -> a
-    7346:7346:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2815:2815 -> a
-    7346:7346:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2822 -> a
-    7347:7348:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2822:2823 -> a
-    7349:7357:void lambda$markProgramMethodOverridesAsLive$73(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):2825:2833 -> a
-    7358:7363:void lambda$markProgramMethodOverridesAsLive$72(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.MethodResolutionResult):2836:2841 -> a
-    7364:7375:void lambda$markProgramMethodOverridesAsLive$71(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2843:2854 -> a
-    7376:7376:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):36:36 -> a
-    7376:7376:void lambda$markProgramMethodOverridesAsLive$71(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2854 -> a
+    7284:7284: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):2716 -> a
+    7285:7285:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    7285:7285:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2791 -> a
+    7285:7285: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):2716 -> a
+    7286:7287:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2791:2792 -> a
+    7286:7287: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):2716 -> a
+    7288:7288:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
+    7288:7288:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2794 -> a
+    7288:7288: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):2716 -> a
+    7289:7289:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2794:2794 -> a
+    7289:7289: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):2716 -> a
+    7290:7290:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2793:2793 -> a
+    7290:7290: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):2716 -> a
+    7291:7294:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2985:2988 -> a
+    7291:7294: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):2718 -> a
+    7295:7295:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reachableFromLiveType(com.android.tools.r8.graph.DexType):46:46 -> a
+    7295:7295:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2988 -> a
+    7295:7295: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):2718 -> a
+    7296:7304:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2989:2997 -> a
+    7296:7304: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):2718 -> a
+    7305:7305:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3001:3001 -> a
+    7305:7305: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):2720 -> a
+    7306:7306:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    7306:7306:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3001 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7377:7377:void lambda$markProgramMethodOverridesAsLive$71(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2864:2864 -> a
-    7378:7379:void lambda$markProgramMethodOverridesAsLive$66(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2848:2849 -> a
-    7380:7381:boolean lambda$markProgramMethodOverridesAsLive$67(com.android.tools.r8.graph.DexDefinition):2852:2853 -> a
-    7382:7382:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> a
-    7382:7382:boolean lambda$markProgramMethodOverridesAsLive$67(com.android.tools.r8.graph.DexDefinition):2852 -> a
+    7306:7306: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):2720 -> a
+    7307:7307:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    7307:7307:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3001 -> a
+    7307:7307: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):2720 -> a
+    7308:7310:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):3001:3003 -> a
+    7308:7310: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):2720 -> a
+    7311:7311:void lambda$processNewlyInstantiatedClass$65(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2701:2701 -> a
+    7312:7312:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2735:2735 -> a
+    7313:7313:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    7313:7313:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2735 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7383:7383:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> a
-    7383:7383:boolean lambda$markProgramMethodOverridesAsLive$67(com.android.tools.r8.graph.DexDefinition):2852 -> a
-    7384:7384:void lambda$markProgramMethodOverridesAsLive$69(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2856:2856 -> a
-    7385:7389:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$68(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2859:2859 -> a
-    7390:7390:void lambda$markProgramMethodOverridesAsLive$70(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2868:2868 -> a
-    7391:7396:void lambda$markProgramMethodOverridesAsLive$70(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2867:2872 -> a
-    7397:7397:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
-    7397:7397:void lambda$markProgramMethodOverridesAsLive$70(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2874 -> a
-    7398:7398: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):50:50 -> a
-    7398:7398:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
-    7398:7398:void lambda$markProgramMethodOverridesAsLive$70(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2874 -> a
-    7399:7399:void lambda$markProgramMethodOverridesAsLive$70(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2872:2872 -> a
-    7400:7400:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2925:2925 -> a
-    7401:7416:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4543:4558 -> a
-    7401:7416:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2929 -> a
-    7417:7425:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4594:4602 -> a
-    7417:7425:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4564 -> a
-    7417:7425:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2929 -> a
-    7426:7440:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4565:4579 -> a
-    7426:7440:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2929 -> a
-    7441:7449:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4594:4602 -> a
-    7441:7449:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4583 -> a
-    7441:7449:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2929 -> a
-    7450:7452:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4583:4585 -> a
-    7450:7452:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2929 -> a
-    7453:7453:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2932:2932 -> a
-    7454:7454:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    7454:7454:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2937 -> a
-    7455:7455:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2940:2940 -> a
-    7456:7456:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2939:2939 -> a
-    7457:7457:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$74(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2935:2935 -> a
-    7458:7469:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2946:2957 -> a
-    7470:7472:void lambda$markOverridesAsLibraryMethodOverrides$75(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2959:2961 -> a
-    7473:7479:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3060:3066 -> a
-    7480:7480:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3112:3112 -> a
-    7480:7480:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3067 -> a
-    7481:7481:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2006:2006 -> a
-    7481:7481:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3112 -> a
-    7481:7481:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3067 -> a
-    7482:7482:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3113:3113 -> a
-    7482:7482:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3067 -> a
-    7483:7483:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2241:2241 -> a
-    7483:7483:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> a
-    7483:7483:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3067 -> a
-    7484:7484:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
-    7484:7484:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2242 -> a
-    7484:7484:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> a
-    7484:7484:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3067 -> a
-    7485:7485:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2247:2247 -> a
-    7485:7485:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2239 -> a
-    7485:7485:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> a
-    7485:7485:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3067 -> a
-    7486:7487:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2252:2253 -> a
-    7486:7487:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2247 -> a
-    7486:7487:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2239 -> a
-    7486:7487:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> a
-    7486:7487:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3067 -> a
-    7488:7491:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3068:3071 -> a
-    7492:7492:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3112:3112 -> a
-    7492:7492:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3072 -> a
-    7493:7493:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2006:2006 -> a
-    7493:7493:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3112 -> a
-    7493:7493:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3072 -> a
-    7494:7494:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3113:3113 -> a
-    7494:7494:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3072 -> a
-    7495:7495:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2241:2241 -> a
-    7495:7495:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> a
-    7495:7495:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3072 -> a
-    7496:7496:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
-    7496:7496:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2242 -> a
-    7496:7496:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> a
-    7496:7496:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3072 -> a
-    7497:7497:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2247:2247 -> a
-    7497:7497:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2239 -> a
-    7497:7497:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> a
-    7497:7497:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3072 -> a
-    7498:7499:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2252:2253 -> a
-    7498:7499:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2247 -> a
-    7498:7499:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2239 -> a
-    7498:7499:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> a
-    7498:7499:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3072 -> a
-    7500:7501:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3076:3077 -> a
-    7502:7502:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():713:713 -> a
-    7502:7502:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3078 -> a
-    7503:7507:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3078:3082 -> a
-    7508:7508:void lambda$markFieldAsLive$76(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3082:3082 -> a
-    7509:7509:void lambda$markFieldAsReachable$78(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3108:3108 -> a
-    7510:7511:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):3121:3122 -> a
-    7510:7511:void lambda$traceInstanceFieldRead$28(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1701 -> a
-    7512:7512:void lambda$traceInstanceFieldRead$28(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1702:1702 -> a
-    7513:7513:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):3161:3161 -> a
-    7514:7514:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3215:3215 -> a
-    7515:7515:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3219:3219 -> a
-    7515:7515:void lambda$desugar$109(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3934 -> a
-    7516:7516:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3215:3215 -> a
-    7516:7516:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3219 -> a
-    7516:7516:void lambda$desugar$109(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3934 -> a
-    7517:7517:void lambda$desugar$109(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3937:3937 -> a
-    7518:7519:boolean isTypeLive(com.android.tools.r8.graph.DexClass):3231:3232 -> a
-    7520:7520:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):3237:3237 -> a
-    7520:7520:boolean isTypeLive(com.android.tools.r8.graph.DexClass):3232 -> a
-    7521:7522:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3241:3242 -> a
-    7521:7522:boolean isTypeLive(com.android.tools.r8.graph.DexClass):3233 -> a
-    7523:7533:boolean isReachable(com.android.tools.r8.graph.Definition):3246:3256 -> a
-    7534:7534:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):3157:3157 -> a
-    7534:7534:boolean isReachable(com.android.tools.r8.graph.Definition):3257 -> a
-    7535:7535:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):3153:3153 -> a
-    7535:7535:boolean isReachable(com.android.tools.r8.graph.Definition):3257 -> a
-    7536:7537:boolean isReachable(com.android.tools.r8.graph.Definition):3259:3260 -> a
-    7538:7538:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3219:3219 -> a
-    7538:7538:boolean isReachable(com.android.tools.r8.graph.Definition):3261 -> a
-    7539:7539:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3215:3215 -> a
-    7539:7539:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3219 -> a
-    7539:7539:boolean isReachable(com.android.tools.r8.graph.Definition):3261 -> a
-    7540:7540:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3227:3227 -> a
-    7540:7540:boolean isReachable(com.android.tools.r8.graph.Definition):3261 -> a
-    7541:7541:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3223:3223 -> a
-    7541:7541:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3227 -> a
-    7541:7541:boolean isReachable(com.android.tools.r8.graph.Definition):3261 -> a
-    7542:7542:boolean isReachable(com.android.tools.r8.graph.Definition):3265:3265 -> a
-    7543:7544:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3241:3242 -> a
-    7543:7544:boolean isReachable(com.android.tools.r8.graph.Definition):3265 -> a
-    7545:7545:void forAllLiveClasses(java.util.function.Consumer):3269:3269 -> a
-    7546:7556:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3274:3284 -> a
-    7557:7573:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3286:3302 -> a
-    7574:7574:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():143:143 -> a
-    7574:7574:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3310 -> a
+    7314:7314:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    7314:7314:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2735 -> a
+    7315:7319:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2735:2739 -> a
+    7320:7321:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):3007:3008 -> a
+    7320:7321:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2740 -> a
+    7322:7330:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2806:2814 -> a
+    7331:7345:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2897:2911 -> a
+    7331:7345:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2816 -> a
+    7346:7346:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2908:2908 -> a
+    7346:7346:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2816 -> a
+    7347:7347:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    7347:7347:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2918 -> a
+    7347:7347:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2816 -> a
+    7348:7350:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2918:2920 -> a
+    7348:7350:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2816 -> a
+    7351:7355:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2919:2923 -> a
+    7351:7355:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2816 -> a
+    7356:7362:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2922:2928 -> a
+    7356:7362:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2816 -> a
+    7363:7363:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2925:2925 -> a
+    7363:7363:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2816 -> a
+    7364:7367:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.List):2818:2821 -> a
+    7368:7368:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2832:2832 -> a
+    7369:7369:boolean com.android.tools.r8.shaking.InstantiatedObject.isLambda():0:0 -> a
+    7369:7369:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2832 -> a
+    7370:7372:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2832:2832 -> a
+    7373:7373:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2827:2827 -> a
+    7373:7373:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2834 -> a
+    7374:7375:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass):2834:2835 -> a
+    7376:7384:void lambda$markProgramMethodOverridesAsLive$73(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey,com.android.tools.r8.utils.collections.ProgramMethodSet):2837:2845 -> a
+    7385:7390:void lambda$markProgramMethodOverridesAsLive$72(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.MethodResolutionResult):2848:2853 -> a
+    7391:7402:void lambda$markProgramMethodOverridesAsLive$71(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2855:2866 -> a
+    7403:7403:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):36:36 -> a
+    7403:7403:void lambda$markProgramMethodOverridesAsLive$71(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2866 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7575:7575:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3313:3313 -> a
-    7576:7576:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2815:2815 -> a
-    7576:7576:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3316 -> a
-    7577:7585:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3316:3324 -> a
-    7586:7586:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    7586:7586:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3324 -> a
-    7587:7602:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3329:3344 -> a
-    7603:7603:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):36:36 -> a
-    7603:7603:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3351 -> a
+    7404:7404:void lambda$markProgramMethodOverridesAsLive$71(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,java.util.List):2876:2876 -> a
+    7405:7406:void lambda$markProgramMethodOverridesAsLive$66(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2860:2861 -> a
+    7407:7408:boolean lambda$markProgramMethodOverridesAsLive$67(com.android.tools.r8.graph.DexDefinition):2864:2865 -> a
+    7409:7409:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> a
+    7409:7409:boolean lambda$markProgramMethodOverridesAsLive$67(com.android.tools.r8.graph.DexDefinition):2864 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7604:7604:void lambda$markVirtualMethodAsReachable$81(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3348:3348 -> a
-    7605:7605:void lambda$markVirtualMethodAsReachable$84(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):3353:3353 -> a
-    7606:7608:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$83(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3356:3356 -> a
-    7609:7612:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):3363:3366 -> a
-    7613:7613:void lambda$markVirtualDispatchTargetAsLive$88(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3366:3366 -> a
-    7614:7618:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3371:3375 -> a
-    7614:7618:void lambda$markVirtualDispatchTargetAsLive$86(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3364 -> a
-    7619:7619:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    7619:7619:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3376 -> a
-    7619:7619:void lambda$markVirtualDispatchTargetAsLive$86(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3364 -> a
-    7620:7620:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3377:3377 -> a
-    7620:7620:void lambda$markVirtualDispatchTargetAsLive$86(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3364 -> a
-    7621:7624:void markVirtualDispatchLambdaTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3384:3387 -> a
-    7621:7624:void lambda$markVirtualDispatchTargetAsLive$87(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3365 -> a
-    7625:7625:void markVirtualDispatchLambdaTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3386:3386 -> a
-    7625:7625:void lambda$markVirtualDispatchTargetAsLive$87(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3365 -> a
-    7626:7627:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3396:3397 -> a
-    7628:7628:void lambda$markFailedMethodResolutionTargets$89(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):3398:3398 -> a
-    7629:7632:void lambda$markFailedMethodResolutionTargets$90(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3400:3403 -> a
-    7633:7642:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3439:3448 -> a
-    7643:7674:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3445:3476 -> a
-    7675:7675:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    7675:7675:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3472 -> a
-    7676:7679:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3478:3481 -> a
-    7680:7680:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    7680:7680:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3482 -> a
-    7681:7682:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3482:3483 -> a
-    7683:7683:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    7683:7683:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3484 -> a
-    7684:7684:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3484:3484 -> a
-    7685:7685:void lambda$markSuperMethodAsReachable$92(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3460:3460 -> a
-    7686:7686:void lambda$markSuperMethodAsReachable$92(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3459:3459 -> a
-    7687:7687:void lambda$traceMainDex$95(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3505:3505 -> a
-    7688:7694:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3517:3523 -> a
-    7695:7695:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):542:542 -> a
-    7695:7695:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3523 -> a
-    7696:7698:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3527:3529 -> a
-    7699:7699:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):542:542 -> a
-    7699:7699:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3529 -> a
-    7700:7700:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3531:3531 -> a
-    7701:7701:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):542:542 -> a
-    7701:7701:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3531 -> a
-    7702:7722:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3534:3554 -> a
-    7723:7726:void finalizeLibraryMethodOverrideInformation():4006:4009 -> a
-    7723:7726:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3555 -> a
-    7727:7728:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3556:3557 -> a
-    7729:7731:boolean verifyKeptGraph():4016:4018 -> a
-    7729:7731:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3557 -> a
-    7732:7737:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3558:3563 -> a
-    7738:7738:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():239:239 -> a
-    7738:7738:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3563 -> a
-    7739:7739:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3568:3568 -> a
-    7740:7740:void lambda$traceApplication$98(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3556:3556 -> a
-    7741:7742:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3573:3574 -> a
-    7743:7747:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3582:3586 -> a
-    7748:7748:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3609:3609 -> a
-    7748:7748:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3587 -> a
-    7749:7749:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    7749:7749:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3610 -> a
+    7410:7410:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> a
+    7410:7410:boolean lambda$markProgramMethodOverridesAsLive$67(com.android.tools.r8.graph.DexDefinition):2864 -> a
+    7411:7411:void lambda$markProgramMethodOverridesAsLive$69(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.LookupTarget):2868:2868 -> a
+    7412:7416:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markProgramMethodOverridesAsLive$68(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod):2871:2871 -> a
+    7417:7417:void lambda$markProgramMethodOverridesAsLive$70(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2880:2880 -> a
+    7418:7423:void lambda$markProgramMethodOverridesAsLive$70(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2879:2884 -> a
+    7424:7424:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
+    7424:7424:void lambda$markProgramMethodOverridesAsLive$70(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2886 -> a
+    7425:7425: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):50:50 -> a
+    7425:7425:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
+    7425:7425:void lambda$markProgramMethodOverridesAsLive$70(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2886 -> a
+    7426:7426:void lambda$markProgramMethodOverridesAsLive$70(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):2884:2884 -> a
+    7427:7427:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2937:2937 -> a
+    7428:7443:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4578:4593 -> a
+    7428:7443:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2941 -> a
+    7444:7452:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4629:4637 -> a
+    7444:7452:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4599 -> a
+    7444:7452:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2941 -> a
+    7453:7467:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4600:4614 -> a
+    7453:7467:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2941 -> a
+    7468:7476:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):4629:4637 -> a
+    7468:7476:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4618 -> a
+    7468:7476:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2941 -> a
+    7477:7479:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):4618:4620 -> a
+    7477:7479:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2941 -> a
+    7480:7480:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2944:2944 -> a
+    7481:7481:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    7481:7481:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2949 -> a
+    7482:7482:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2952:2952 -> a
+    7483:7483:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.MethodResolutionResult):2951:2951 -> a
+    7484:7484:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$74(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2947:2947 -> a
+    7485:7496:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2958:2969 -> a
+    7497:7499:void lambda$markOverridesAsLibraryMethodOverrides$75(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexType):2971:2973 -> a
+    7500:7506:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3072:3078 -> a
+    7507:7507:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3124:3124 -> a
+    7507:7507:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3079 -> a
+    7508:7508:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2013:2013 -> a
+    7508:7508:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3124 -> a
+    7508:7508:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3079 -> a
+    7509:7509:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3125:3125 -> a
+    7509:7509:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3079 -> a
+    7510:7510:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2253:2253 -> a
+    7510:7510:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> a
+    7510:7510:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3079 -> a
+    7511:7511:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
+    7511:7511:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2254 -> a
+    7511:7511:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> a
+    7511:7511:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3079 -> a
+    7512:7512:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2259:2259 -> a
+    7512:7512:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2251 -> a
+    7512:7512:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> a
+    7512:7512:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3079 -> a
+    7513:7514:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2264:2265 -> a
+    7513:7514:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2259 -> a
+    7513:7514:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2251 -> a
+    7513:7514:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> a
+    7513:7514:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3079 -> a
+    7515:7518:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3080:3083 -> a
+    7519:7519:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3124:3124 -> a
+    7519:7519:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3084 -> a
+    7520:7520:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2013:2013 -> a
+    7520:7520:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3124 -> a
+    7520:7520:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3084 -> a
+    7521:7521:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3125:3125 -> a
+    7521:7521:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3084 -> a
+    7522:7522:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2253:2253 -> a
+    7522:7522:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> a
+    7522:7522:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3084 -> a
+    7523:7523:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> a
+    7523:7523:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2254 -> a
+    7523:7523:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> a
+    7523:7523:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3084 -> a
+    7524:7524:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2259:2259 -> a
+    7524:7524:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2251 -> a
+    7524:7524:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> a
+    7524:7524:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3084 -> a
+    7525:7526:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2264:2265 -> a
+    7525:7526:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2259 -> a
+    7525:7526:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2251 -> a
+    7525:7526:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> a
+    7525:7526:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3084 -> a
+    7527:7528:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3088:3089 -> a
+    7529:7529:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():714:714 -> a
+    7529:7529:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3090 -> a
+    7530:7534:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3090:3094 -> a
+    7535:7535:void lambda$markFieldAsLive$76(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3094:3094 -> a
+    7536:7536:void lambda$markFieldAsReachable$78(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3120:3120 -> a
+    7537:7538:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):3133:3134 -> a
+    7537:7538:void lambda$traceInstanceFieldRead$28(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1708 -> a
+    7539:7539:void lambda$traceInstanceFieldRead$28(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1709:1709 -> a
+    7540:7540:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):3173:3173 -> a
+    7541:7541:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3227:3227 -> a
+    7542:7542:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3231:3231 -> a
+    7542:7542:void lambda$desugar$110(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3967 -> a
+    7543:7543:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3227:3227 -> a
+    7543:7543:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3231 -> a
+    7543:7543:void lambda$desugar$110(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3967 -> a
+    7544:7544:void lambda$desugar$110(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3970:3970 -> a
+    7545:7546:boolean isTypeLive(com.android.tools.r8.graph.DexClass):3243:3244 -> a
+    7547:7547:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):3249:3249 -> a
+    7547:7547:boolean isTypeLive(com.android.tools.r8.graph.DexClass):3244 -> a
+    7548:7549:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3253:3254 -> a
+    7548:7549:boolean isTypeLive(com.android.tools.r8.graph.DexClass):3245 -> a
+    7550:7560:boolean isReachable(com.android.tools.r8.graph.Definition):3258:3268 -> a
+    7561:7561:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):3169:3169 -> a
+    7561:7561:boolean isReachable(com.android.tools.r8.graph.Definition):3269 -> a
+    7562:7562:boolean isFieldReferenced(com.android.tools.r8.graph.ProgramField):3165:3165 -> a
+    7562:7562:boolean isReachable(com.android.tools.r8.graph.Definition):3269 -> a
+    7563:7564:boolean isReachable(com.android.tools.r8.graph.Definition):3271:3272 -> a
+    7565:7565:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3231:3231 -> a
+    7565:7565:boolean isReachable(com.android.tools.r8.graph.Definition):3273 -> a
+    7566:7566:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3227:3227 -> a
+    7566:7566:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3231 -> a
+    7566:7566:boolean isReachable(com.android.tools.r8.graph.Definition):3273 -> a
+    7567:7567:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3239:3239 -> a
+    7567:7567:boolean isReachable(com.android.tools.r8.graph.Definition):3273 -> a
+    7568:7568:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3235:3235 -> a
+    7568:7568:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3239 -> a
+    7568:7568:boolean isReachable(com.android.tools.r8.graph.Definition):3273 -> a
+    7569:7569:boolean isReachable(com.android.tools.r8.graph.Definition):3277:3277 -> a
+    7570:7571:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):3253:3254 -> a
+    7570:7571:boolean isReachable(com.android.tools.r8.graph.Definition):3277 -> a
+    7572:7572:void forAllLiveClasses(java.util.function.Consumer):3281:3281 -> a
+    7573:7583:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3286:3296 -> a
+    7584:7600:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3298:3314 -> a
+    7601:7601:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.ProgramMethod.getContextClass():143:143 -> a
+    7601:7601:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3322 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7749:7749:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3587 -> a
-    7750:7750:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    7750:7750:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3610 -> a
-    7750:7750:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3587 -> a
-    7751:7751:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3611:3611 -> a
-    7751:7751:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3587 -> a
-    7752:7753:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):910:911 -> a
-    7752:7753:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612 -> a
-    7752:7753:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3587 -> a
-    7754:7754:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> a
-    7754:7754:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):912 -> a
+    7602:7602:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3325:3325 -> a
+    7603:7603:java.util.Map getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2827:2827 -> a
+    7603:7603:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3328 -> a
+    7604:7612:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3328:3336 -> a
+    7613:7613:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    7613:7613:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3336 -> a
+    7614:7629:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3341:3356 -> a
+    7630:7630:void com.android.tools.r8.graph.LookupResult.forEach(java.util.function.Consumer):36:36 -> a
+    7630:7630:void lambda$markVirtualMethodAsReachable$85(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.MethodResolutionResult):3363 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7754:7754:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612 -> a
-    7754:7754:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3587 -> a
-    7755:7755:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):912:912 -> a
-    7755:7755:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612 -> a
-    7755:7755:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3587 -> a
-    7756:7756:void lambda$applyMinimumKeepInfo$99(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3586:3586 -> a
-    7757:7760:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3595:3598 -> a
-    7761:7761:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    7761:7761:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3599 -> a
-    7762:7762:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    7762:7762:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3599 -> a
+    7631:7631:void lambda$markVirtualMethodAsReachable$81(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):3360:3360 -> a
+    7632:7632:void lambda$markVirtualMethodAsReachable$84(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):3365:3365 -> a
+    7633:7635:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$83(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):3368:3368 -> a
+    7636:7639:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):3375:3378 -> a
+    7640:7640:void lambda$markVirtualDispatchTargetAsLive$88(com.android.tools.r8.graph.LookupTarget,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3378:3378 -> a
+    7641:7645:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3383:3387 -> a
+    7641:7645:void lambda$markVirtualDispatchTargetAsLive$86(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3376 -> a
+    7646:7646:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    7646:7646:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3388 -> a
+    7646:7646:void lambda$markVirtualDispatchTargetAsLive$86(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3376 -> a
+    7647:7647:void markVirtualDispatchMethodTargetAsLive(com.android.tools.r8.graph.LookupMethodTarget,java.util.function.Function):3389:3389 -> a
+    7647:7647:void lambda$markVirtualDispatchTargetAsLive$86(java.util.function.Function,com.android.tools.r8.graph.LookupMethodTarget):3376 -> a
+    7648:7651:void markVirtualDispatchLambdaTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3396:3399 -> a
+    7648:7651:void lambda$markVirtualDispatchTargetAsLive$87(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3377 -> a
+    7652:7652:void markVirtualDispatchLambdaTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):3398:3398 -> a
+    7652:7652:void lambda$markVirtualDispatchTargetAsLive$87(java.util.function.Function,com.android.tools.r8.graph.LookupLambdaTarget):3377 -> a
+    7653:7654:void markFailedMethodResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodResolutionResult$FailedResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3408:3409 -> a
+    7655:7655:void lambda$markFailedMethodResolutionTargets$89(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):3410:3410 -> a
+    7656:7659:void lambda$markFailedMethodResolutionTargets$90(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):3412:3415 -> a
+    7660:7669:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3451:3460 -> a
+    7670:7701:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3457:3488 -> a
+    7702:7702:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    7702:7702:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3484 -> a
+    7703:7706:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3490:3493 -> a
+    7707:7707:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    7707:7707:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3494 -> a
+    7708:7709:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3494:3495 -> a
+    7710:7710:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    7710:7710:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3496 -> a
+    7711:7711:void lambda$markSuperMethodAsReachable$94(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.MethodResolutionResult):3496:3496 -> a
+    7712:7712:void lambda$markSuperMethodAsReachable$92(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3472:3472 -> a
+    7713:7713:void lambda$markSuperMethodAsReachable$92(com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3471:3471 -> a
+    7714:7714:void lambda$traceMainDex$95(com.android.tools.r8.shaking.MainDexInfo$Builder,com.android.tools.r8.graph.DexEncodedMethod):3517:3517 -> a
+    7715:7721:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3529:3535 -> a
+    7722:7722:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):543:543 -> a
+    7722:7722:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3535 -> a
+    7723:7725:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3539:3541 -> a
+    7726:7726:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):543:543 -> a
+    7726:7726:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3541 -> a
+    7727:7727:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3543:3543 -> a
+    7728:7728:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):543:543 -> a
+    7728:7728:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3543 -> a
+    7729:7749:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3546:3566 -> a
+    7750:7753:void finalizeLibraryMethodOverrideInformation():4039:4042 -> a
+    7750:7753:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3567 -> a
+    7754:7755:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3568:3569 -> a
+    7756:7758:boolean verifyKeptGraph():4049:4051 -> a
+    7756:7758:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3569 -> a
+    7759:7764:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3570:3575 -> a
+    7765:7765:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():240:240 -> a
+    7765:7765:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3575 -> a
+    7766:7766:com.android.tools.r8.shaking.EnqueuerResult traceApplication(com.android.tools.r8.shaking.RootSetUtils$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3580:3580 -> a
+    7767:7767:void lambda$traceApplication$98(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3568:3568 -> a
+    7768:7769:void includeMinimumKeepInfo(com.android.tools.r8.shaking.RootSetUtils$RootSetBase):3585:3586 -> a
+    7770:7774:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3594:3598 -> a
+    7775:7775:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3621:3621 -> a
+    7775:7775:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3599 -> a
+    7776:7776:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
+    7776:7776:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3622 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7763:7763:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3600:3600 -> a
-    7764:7764:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
-    7764:7764:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3600 -> a
+    7776:7776:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3599 -> a
+    7777:7777:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
+    7777:7777:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3622 -> a
+    7777:7777:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3599 -> a
+    7778:7778:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3623:3623 -> a
+    7778:7778:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3599 -> a
+    7779:7780:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):911:912 -> a
+    7779:7780:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3624 -> a
+    7779:7780:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3599 -> a
+    7781:7781:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> a
+    7781:7781:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):913 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7765:7765:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> a
-    7765:7765:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
+    7781:7781:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3624 -> a
+    7781:7781:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3599 -> a
+    7782:7782:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):913:913 -> a
+    7782:7782:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3624 -> a
+    7782:7782:void applyMinimumKeepInfo(com.android.tools.r8.graph.DexProgramClass):3599 -> a
+    7783:7783:void lambda$applyMinimumKeepInfo$99(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3598:3598 -> a
+    7784:7787:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3607:3610 -> a
+    7788:7788:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    7788:7788:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3611 -> a
+    7789:7789:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    7789:7789:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3611 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7765:7765:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3600 -> a
-    7766:7766:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3609:3609 -> a
-    7766:7766:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3602 -> a
-    7767:7767:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    7767:7767:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3610 -> a
+    7790:7790:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612:3612 -> a
+    7791:7791:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
+    7791:7791:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7767:7767:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3602 -> a
-    7768:7768:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    7768:7768:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3610 -> a
-    7768:7768:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3602 -> a
-    7769:7769:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3611:3611 -> a
-    7769:7769:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3602 -> a
-    7770:7771:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):910:911 -> a
-    7770:7771:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612 -> a
-    7770:7771:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3602 -> a
-    7772:7772:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> a
-    7772:7772:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):912 -> a
+    7792:7792:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> a
+    7792:7792:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7772:7772:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612 -> a
-    7772:7772:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3602 -> a
-    7773:7773:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):912:912 -> a
-    7773:7773:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612 -> a
-    7773:7773:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3602 -> a
-    7774:7778:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3633:3637 -> a
-    7779:7779:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3661:3661 -> a
-    7779:7779:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3638 -> a
-    7780:7780:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    7780:7780:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3662 -> a
+    7792:7792:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612 -> a
+    7793:7793:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3621:3621 -> a
+    7793:7793:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3614 -> a
+    7794:7794:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
+    7794:7794:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3622 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7780:7780:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3638 -> a
-    7781:7781:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    7781:7781:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3662 -> a
-    7781:7781:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3638 -> a
-    7782:7782:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3663:3663 -> a
-    7782:7782:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3638 -> a
-    7783:7785:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):942:944 -> a
-    7783:7785:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7783:7785:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3638 -> a
-    7786:7786:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getReasons():523:523 -> a
-    7786:7786:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):948 -> a
+    7794:7794:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3614 -> a
+    7795:7795:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
+    7795:7795:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3622 -> a
+    7795:7795:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3614 -> a
+    7796:7796:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3623:3623 -> a
+    7796:7796:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3614 -> a
+    7797:7798:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):911:912 -> a
+    7797:7798:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3624 -> a
+    7797:7798:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3614 -> a
+    7799:7799:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> a
+    7799:7799:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):913 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7786:7786:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7786:7786:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3638 -> a
-    7787:7787:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> a
-    7787:7787:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):949 -> a
-    7787:7787:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7787:7787:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3638 -> a
-    7788:7788:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):950:950 -> a
-    7788:7788:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7788:7788:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3638 -> a
-    7789:7789:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):946:946 -> a
-    7789:7789:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7789:7789:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3638 -> a
-    7790:7790:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):944:944 -> a
-    7790:7790:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7790:7790:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3638 -> a
-    7791:7791:void lambda$applyMinimumKeepInfo$101(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3637:3637 -> a
-    7792:7795:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3649:3652 -> a
-    7796:7796:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    7796:7796:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3653 -> a
-    7797:7797:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    7797:7797:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3653 -> a
+    7799:7799:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3624 -> a
+    7799:7799:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3614 -> a
+    7800:7800:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):913:913 -> a
+    7800:7800:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3624 -> a
+    7800:7800:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3614 -> a
+    7801:7805:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3645:3649 -> a
+    7806:7806:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3673:3673 -> a
+    7806:7806:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3650 -> a
+    7807:7807:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
+    7807:7807:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3674 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7798:7798:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3654:3654 -> a
-    7799:7799:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
-    7799:7799:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3654 -> a
+    7807:7807:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3650 -> a
+    7808:7808:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
+    7808:7808:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3674 -> a
+    7808:7808:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3650 -> a
+    7809:7809:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3675:3675 -> a
+    7809:7809:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3650 -> a
+    7810:7812:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):943:945 -> a
+    7810:7812:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7810:7812:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3650 -> a
+    7813:7813:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getReasons():523:523 -> a
+    7813:7813:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):949 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7800:7800:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> a
-    7800:7800:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7800:7800:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3654 -> a
-    7801:7801:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3661:3661 -> a
-    7801:7801:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3656 -> a
-    7802:7802:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    7802:7802:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3662 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7802:7802:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3656 -> a
-    7803:7803:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    7803:7803:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3662 -> a
-    7803:7803:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3656 -> a
-    7804:7804:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3663:3663 -> a
-    7804:7804:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3656 -> a
-    7805:7807:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):942:944 -> a
-    7805:7807:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7805:7807:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3656 -> a
-    7808:7808:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getReasons():523:523 -> a
-    7808:7808:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):948 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7808:7808:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7808:7808:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3656 -> a
-    7809:7809:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> a
-    7809:7809:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):949 -> a
-    7809:7809:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7809:7809:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3656 -> a
-    7810:7810:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):950:950 -> a
-    7810:7810:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7810:7810:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3656 -> a
-    7811:7811:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):946:946 -> a
-    7811:7811:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7811:7811:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3656 -> a
-    7812:7812:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):944:944 -> a
-    7812:7812:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> a
-    7812:7812:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3656 -> a
-    7813:7818:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):3683:3688 -> a
-    7819:7819:void lambda$applyMinimumKeepInfo$103(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3687:3687 -> a
-    7820:7823:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3701:3704 -> a
+    7813:7813:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7813:7813:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3650 -> a
+    7814:7814:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> a
+    7814:7814:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):950 -> a
+    7814:7814:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7814:7814:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3650 -> a
+    7815:7815:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):951:951 -> a
+    7815:7815:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7815:7815:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3650 -> a
+    7816:7816:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):947:947 -> a
+    7816:7816:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7816:7816:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3650 -> a
+    7817:7817:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):945:945 -> a
+    7817:7817:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7817:7817:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramField):3650 -> a
+    7818:7818:void lambda$applyMinimumKeepInfo$101(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3649:3649 -> a
+    7819:7822:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3661:3664 -> a
+    7823:7823:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    7823:7823:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3665 -> a
     7824:7824:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    7824:7824:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3705 -> a
-    7825:7825:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    7825:7825:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3705 -> a
+    7824:7824:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3665 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7826:7826:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3706:3706 -> a
-    7827:7827:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
-    7827:7827:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3706 -> a
+    7825:7825:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3666:3666 -> a
+    7826:7826:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
+    7826:7826:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3666 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7828:7828:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> a
-    7828:7828:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
+    7827:7827:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> a
+    7827:7827:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7828:7828:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3706 -> a
-    7829:7835:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3702:3708 -> a
-    7836:7839:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):3744:3747 -> a
-    7840:7853:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3913:3926 -> a
-    7854:7854:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):76:76 -> a
-    7854:7854:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3927 -> a
-    7855:7875:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3942:3962 -> a
-    7876:7876:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3219:3219 -> a
-    7876:7876:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3964 -> a
-    7877:7877:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3215:3215 -> a
-    7877:7877:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3219 -> a
-    7877:7877:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3964 -> a
-    7878:7886:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3965:3973 -> a
-    7887:7887:void lambda$desugar$110(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):3945:3945 -> a
-    7888:7888:void lambda$desugar$111(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3952:3952 -> a
-    7889:7891:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3977:3979 -> a
-    7892:7894:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):3984:3986 -> a
-    7895:7932:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4027:4064 -> a
-    7933:7933:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    7933:7933:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4064 -> a
-    7934:7975:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4065:4106 -> a
-    7976:7978:java.util.Set toDescriptorSet(java.util.Set):4250:4252 -> a
-    7976:7978:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4106 -> a
-    7979:7984:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4106:4111 -> a
-    7985:7987:java.util.Set toDescriptorSet(java.util.Set):4250:4252 -> a
-    7985:7987:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4111 -> a
-    7988:8002:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4111:4125 -> a
-    8003:8008:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):4259:4264 -> a
-    8003:8008:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4132 -> a
-    8009:8018:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4133:4142 -> a
-    8019:8019:void lambda$createEnqueuerResult$112(java.util.Set,com.android.tools.r8.graph.DexProgramClass):4030:4030 -> a
-    8020:8020:boolean lambda$createEnqueuerResult$113(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):4036:4036 -> a
-    8021:8021:void lambda$createEnqueuerResult$114(com.android.tools.r8.graph.ClasspathOrLibraryClass):4060:4060 -> a
-    8022:8026:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):747:751 -> a
-    8022:8026:void lambda$createEnqueuerResult$114(com.android.tools.r8.graph.ClasspathOrLibraryClass):4060 -> a
-    8027:8027:void amendKeepInfoWithCompanionMethods():4152:4152 -> a
-    8028:8029:void forEachCompanionMethod(java.util.function.BiConsumer):4146:4147 -> a
-    8028:8029:void amendKeepInfoWithCompanionMethods():4152 -> a
-    8030:8032:void lambda$amendKeepInfoWithCompanionMethods$116(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4154:4156 -> a
-    8033:8033:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):109:109 -> a
-    8033:8033:void lambda$amendKeepInfoWithCompanionMethods$116(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4156 -> a
-    8034:8034:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramMethod():55:55 -> a
-    8034:8034:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):111 -> a
-    8034:8034:void lambda$amendKeepInfoWithCompanionMethods$116(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4156 -> a
-    8035:8036:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):113:114 -> a
-    8035:8036:void lambda$amendKeepInfoWithCompanionMethods$116(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4156 -> a
-    8037:8040:void lambda$amendKeepInfoWithCompanionMethods$116(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4156:4159 -> a
-    8041:8041:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    8041:8041:void lambda$amendKeepInfoWithCompanionMethods$116(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4159 -> a
-    8042:8042:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    8042:8042:void lambda$amendKeepInfoWithCompanionMethods$116(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4159 -> a
+    7827:7827:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3666 -> a
+    7828:7828:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3673:3673 -> a
+    7828:7828:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3668 -> a
+    7829:7829:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
+    7829:7829:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3674 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    8043:8046:void lambda$amendKeepInfoWithCompanionMethods$116(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4160:4163 -> a
-    8047:8047:void lambda$amendKeepInfoWithCompanionMethods$116(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4162:4162 -> a
-    8048:8058:java.util.Set amendWithCompanionMethods(java.util.Set):4168:4178 -> a
-    8059:8060:void lambda$amendWithCompanionMethods$117(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4174:4175 -> a
-    8061:8069:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4196:4204 -> a
-    8070:8070:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16491,"2":16492,"3":16493,"4":16494,"5":16495}}
-    16491:16491:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4204:4204 -> a
-    16492:16492:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4204:4204 -> a
-    16493:16493:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4204:4204 -> a
-    16494:16494:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4204:4204 -> a
-    16495:16495:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4204:4204 -> a
-    12274:12277:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4204:4207 -> a
-    12278:12278:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16498,"2":16499,"3":16500,"4":16501,"5":16502}}
-    16498:16498:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4207:4207 -> a
-    16499:16499:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4207:4207 -> a
-    16500:16500:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4207:4207 -> a
-    16501:16501:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4207:4207 -> a
-    16502:16502:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4207:4207 -> a
-    16485:16490:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4207:4212 -> a
-    16503:16503:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4270:4270 -> a
-    16504:16506:long getNumberOfLiveItems():4426:4428 -> a
-    16504:16506:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4273 -> a
-    16507:16507:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4274:4274 -> a
-    16508:16508:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16508:16508:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4274 -> a
+    7829:7829:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3668 -> a
+    7830:7830:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
+    7830:7830:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3674 -> a
+    7830:7830:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3668 -> a
+    7831:7831:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3675:3675 -> a
+    7831:7831:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3668 -> a
+    7832:7834:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):943:945 -> a
+    7832:7834:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7832:7834:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3668 -> a
+    7835:7835:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getReasons():523:523 -> a
+    7835:7835:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):949 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16509:16509:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16509:16509:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4274 -> a
-    16510:16510:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4275:4275 -> a
-    16511:16511:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():536:536 -> a
-    16511:16511:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4275 -> a
+    7835:7835:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7835:7835:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3668 -> a
+    7836:7836:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> a
+    7836:7836:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):950 -> a
+    7836:7836:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7836:7836:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3668 -> a
+    7837:7837:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):951:951 -> a
+    7837:7837:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7837:7837:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3668 -> a
+    7838:7838:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):947:947 -> a
+    7838:7838:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7838:7838:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3668 -> a
+    7839:7839:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):945:945 -> a
+    7839:7839:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> a
+    7839:7839:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3668 -> a
+    7840:7845:void applyMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod):3695:3700 -> a
+    7846:7846:void lambda$applyMinimumKeepInfo$103(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3699:3699 -> a
+    7847:7850:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3713:3716 -> a
+    7851:7851:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    7851:7851:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3717 -> a
+    7852:7852:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    7852:7852:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3717 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16512:16512:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():536:536 -> a
-    16512:16512:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4275 -> a
-    16513:16513:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4276:4276 -> a
-    16514:16516:long getNumberOfLiveItems():4426:4428 -> a
-    16514:16516:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4280 -> a
-    16517:16525:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4284:4292 -> a
-    16526:16526: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):2113:2113 -> a
-    16526:16526:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4293 -> a
-    16527:16536:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4294:4303 -> a
-    16537:16539:long getNumberOfLiveItems():4426:4428 -> a
-    16537:16539:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4303 -> a
-    16540:16541:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4303:4304 -> a
-    16542:16542:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16542:16542:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4304 -> a
+    7853:7853:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3718:3718 -> a
+    7854:7854:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> a
+    7854:7854:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3718 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16543:16543:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16543:16543:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4304 -> a
-    16544:16548:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4311:4315 -> a
-    16549:16549:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16549:16549:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4315 -> a
+    7855:7855:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> a
+    7855:7855:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16550:16550:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16550:16550:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4315 -> a
-    16551:16552:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4320:4321 -> a
-    16553:16553:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16553:16553:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4321 -> a
+    7855:7855:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3718 -> a
+    7856:7862:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):3714:3720 -> a
+    7863:7866:void applyMinimumKeepInfoDependentOn(com.android.tools.r8.shaking.EnqueuerEvent):3756:3759 -> a
+    7867:7901:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3925:3959 -> a
+    7902:7902:com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer.createForR8(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,java.util.function.BiConsumer):76:76 -> a
+    7902:7902:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3960 -> a
+    7903:7923:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3975:3995 -> a
+    7924:7924:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3231:3231 -> a
+    7924:7924:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3997 -> a
+    7925:7925:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):3227:3227 -> a
+    7925:7925:boolean isMethodLive(com.android.tools.r8.graph.ProgramMethod):3231 -> a
+    7925:7925:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3997 -> a
+    7926:7934:void desugar(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3998:4006 -> a
+    7935:7941:void lambda$desugar$109(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):3945:3951 -> a
+    7942:7942:void lambda$desugar$111(com.android.tools.r8.ir.desugar.ProgramAdditions,com.android.tools.r8.graph.ProgramMethod):3978:3978 -> a
+    7943:7943:void lambda$desugar$112(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$R8CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod):3985:3985 -> a
+    7944:7946:void recordLambdaSynthesizingContext(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):4010:4012 -> a
+    7947:7949:void recordConstantDynamicSynthesizingContext(com.android.tools.r8.ir.desugar.constantdynamic.ConstantDynamicClass,com.android.tools.r8.graph.ProgramMethod):4017:4019 -> a
+    7950:7987:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4060:4097 -> a
+    7988:7988:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    7988:7988:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4097 -> a
+    7989:8030:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4098:4139 -> a
+    8031:8033:java.util.Set toDescriptorSet(java.util.Set):4281:4283 -> a
+    8031:8033:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4139 -> a
+    8034:8039:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4139:4144 -> a
+    8040:8042:java.util.Set toDescriptorSet(java.util.Set):4281:4283 -> a
+    8040:8042:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4144 -> a
+    8043:8055:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4144:4156 -> a
+    8056:8061:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):4290:4295 -> a
+    8056:8061:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4163 -> a
+    8062:8071:com.android.tools.r8.shaking.EnqueuerResult createEnqueuerResult(com.android.tools.r8.graph.AppInfoWithClassHierarchy):4164:4173 -> a
+    8072:8072:void lambda$createEnqueuerResult$113(java.util.Set,com.android.tools.r8.graph.DexProgramClass):4063:4063 -> a
+    8073:8073:boolean lambda$createEnqueuerResult$114(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):4069:4069 -> a
+    8074:8074:void lambda$createEnqueuerResult$115(com.android.tools.r8.graph.ClasspathOrLibraryClass):4093:4093 -> a
+    8075:8079:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):748:752 -> a
+    8075:8079:void lambda$createEnqueuerResult$115(com.android.tools.r8.graph.ClasspathOrLibraryClass):4093 -> a
+    8080:8080:void amendKeepInfoWithCompanionMethods():4183:4183 -> a
+    8081:8082:void forEachCompanionMethod(java.util.function.BiConsumer):4177:4178 -> a
+    8081:8082:void amendKeepInfoWithCompanionMethods():4183 -> a
+    8083:8085:void lambda$amendKeepInfoWithCompanionMethods$117(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4185:4187 -> a
+    8086:8086:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):109:109 -> a
+    8086:8086:void lambda$amendKeepInfoWithCompanionMethods$117(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4187 -> a
+    8087:8087:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramMethod():55:55 -> a
+    8087:8087:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):111 -> a
+    8087:8087:void lambda$amendKeepInfoWithCompanionMethods$117(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4187 -> a
+    8088:8089:com.android.tools.r8.shaking.KeepMethodInfo com.android.tools.r8.shaking.KeepInfoCollection.getMethodInfo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexDefinitionSupplier):113:114 -> a
+    8088:8089:void lambda$amendKeepInfoWithCompanionMethods$117(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4187 -> a
+    8090:8093:void lambda$amendKeepInfoWithCompanionMethods$117(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4187:4190 -> a
+    8094:8094:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
+    8094:8094:void lambda$amendKeepInfoWithCompanionMethods$117(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4190 -> a
+    8095:8095:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
+    8095:8095:void lambda$amendKeepInfoWithCompanionMethods$117(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4190 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16554:16554:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16554:16554:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4321 -> a
-    16555:16562:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4321:4328 -> a
-    16563:16563:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16563:16563:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4328 -> a
+    8096:8099:void lambda$amendKeepInfoWithCompanionMethods$117(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4191:4194 -> a
+    8100:8100:void lambda$amendKeepInfoWithCompanionMethods$117(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4193:4193 -> a
+    8101:8111:java.util.Set amendWithCompanionMethods(java.util.Set):4199:4209 -> a
+    8112:8113:void lambda$amendWithCompanionMethods$118(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):4205:4206 -> a
+    8114:8122:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4227:4235 -> a
+    8123:8123:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16606,"2":16607,"3":16608,"4":16609,"5":16610}}
+    16606:16606:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4235:4235 -> a
+    16607:16607:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4235:4235 -> a
+    16608:16608:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4235:4235 -> a
+    16609:16609:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4235:4235 -> a
+    16610:16610:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4235:4235 -> a
+    12358:12361:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4235:4238 -> a
+    12362:12362:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16613,"2":16614,"3":16615,"4":16616,"5":16617}}
+    16613:16613:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4238:4238 -> a
+    16614:16614:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4238:4238 -> a
+    16615:16615:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4238:4238 -> a
+    16616:16616:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4238:4238 -> a
+    16617:16617:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4238:4238 -> a
+    16600:16605:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4238:4243 -> a
+    16618:16618:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4301:4301 -> a
+    16619:16621:long getNumberOfLiveItems():4457:4459 -> a
+    16619:16621:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4304 -> a
+    16622:16622:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4305:4305 -> a
+    16623:16623:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16623:16623:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4305 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16564:16564:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16564:16564:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4328 -> a
-    16565:16581:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4333:4349 -> a
-    16582:16582:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16582:16582:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4349 -> a
+    16624:16624:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16624:16624:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4305 -> a
+    16625:16625:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4306:4306 -> a
+    16626:16626:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():536:536 -> a
+    16626:16626:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4306 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16583:16583:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    16583:16583:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4349 -> a
-    16584:16600:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4357:4373 -> a
-    16601:16601:java.util.Set lambda$trace$118(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):4289:4289 -> a
-    16602:16602:void lambda$trace$119(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4327:4327 -> a
-    16603:16603:void lambda$postProcessingDesugaring$120(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4390:4390 -> a
-    16604:16604:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
-    16604:16604:void lambda$postProcessingDesugaring$120(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4394 -> a
+    16627:16627:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():536:536 -> a
+    16627:16627:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4306 -> a
+    16628:16628:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4307:4307 -> a
+    16629:16631:long getNumberOfLiveItems():4457:4459 -> a
+    16629:16631:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4311 -> a
+    16632:16640:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4315:4323 -> a
+    16641:16641: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):2199:2199 -> a
+    16641:16641:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4324 -> a
+    16642:16651:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4325:4334 -> a
+    16652:16654:long getNumberOfLiveItems():4457:4459 -> a
+    16652:16654:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4334 -> a
+    16655:16656:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4334:4335 -> a
+    16657:16657:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16657:16657:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4335 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16605:16608:void lambda$postProcessingDesugaring$120(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4394:4397 -> a
-    16609:16609:void com.android.tools.r8.shaking.MissingClasses$Builder.addNewMissingClassWithDesugarDiagnostic(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.errors.DesugarDiagnostic):93:93 -> a
-    16609:16609:void lambda$postProcessingDesugaring$120(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4390 -> a
+    16658:16658:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16658:16658:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4335 -> a
+    16659:16663:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4342:4346 -> a
+    16664:16664:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16664:16664:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4346 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16610:16616:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):4436:4442 -> a
-    16617:16619:void lambda$addConsequentRootSet$122(com.android.tools.r8.graph.DexType,java.util.Set):4444:4446 -> a
-    16620:16624:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):987:991 -> a
-    16620:16624:void lambda$addConsequentRootSet$122(com.android.tools.r8.graph.DexType,java.util.Set):4447 -> a
-    16625:16632:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4468:4475 -> a
-    16633:16636:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4474:4477 -> a
-    16637:16637:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4476:4476 -> a
-    16638:16645:void retainAnnotationForFinalTreeShaking(java.util.List):4496:4503 -> a
-    16646:16646:void retainAnnotationForFinalTreeShaking(java.util.List):4500:4500 -> a
-    16647:16650:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4535:4538 -> a
-    16651:16657:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4610:4616 -> a
-    16658:16658:com.android.tools.r8.shaking.Enqueuer$Mode getMode():522:522 -> a
-    16658:16658:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4674 -> a
-    16658:16658:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4619 -> a
-    16659:16659:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4674:4674 -> a
-    16659:16659:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4619 -> a
-    16660:16660:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3888:3888 -> a
-    16660:16660:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4675 -> a
-    16660:16660:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4619 -> a
-    16661:16663:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):3882:3884 -> a
-    16661:16663:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3889 -> a
-    16661:16663:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4675 -> a
-    16661:16663:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4619 -> a
-    16664:16679:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3891:3906 -> a
-    16664:16679:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4675 -> a
-    16664:16679:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4619 -> a
-    16680:16680:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4680:4680 -> a
-    16680:16680:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4619 -> a
-    16681:16685:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4621:4625 -> a
-    16686:16686:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    16686:16686:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4625 -> a
-    16687:16687:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    16687:16687:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4627 -> a
-    16688:16688:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4627:4627 -> a
-    16689:16689:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
-    16689:16689:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4628 -> a
-    16690:16695:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4628:4633 -> a
-    16696:16696:void lambda$markMethodAsLive$123(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4633:4633 -> a
-    16697:16697:void lambda$markMethodAsTargeted$124(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4653:4653 -> a
-    16698:16698:void lambda$traceMethodDefinitionExcludingCode$125(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):4663:4663 -> a
-    16699:16699:void lambda$traceCode$126(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4688:4688 -> a
-    16700:16700:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4714:4714 -> a
-    16701:16716:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):4740:4755 -> a
-    16701:16716:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4716 -> a
-    16717:16717:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4720:4720 -> a
-    16718:16718:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    16718:16718:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4721 -> a
+    16665:16665:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16665:16665:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4346 -> a
+    16666:16667:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4351:4352 -> a
+    16668:16668:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16668:16668:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4352 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16719:16719:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    16719:16719:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4721 -> a
-    16720:16724:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4722:4726 -> a
-    16725:16725:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():818:818 -> a
-    16725:16725:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():804 -> a
-    16725:16725:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4727 -> a
-    16726:16730:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4728:4732 -> a
-    16731:16736:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4729:4734 -> a
-    16737:16737:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    16737:16737:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694 -> a
-    16737:16737:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4733 -> a
-    16738:16738:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694:3694 -> a
-    16738:16738:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4733 -> a
-    16739:16745:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4773:4779 -> a
-    16746:16753:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4886:4893 -> a
-    16746:16753:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16754:16756:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4892:4894 -> a
-    16754:16756:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16757:16757:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):844:844 -> a
-    16757:16757:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4900 -> a
-    16757:16757:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16758:16758:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4904:4904 -> a
-    16758:16758:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16759:16759:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16759:16759:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4906 -> a
-    16759:16759:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16760:16760:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4704:4704 -> a
-    16760:16760:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4907 -> a
-    16760:16760:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16761:16761:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():818:818 -> a
-    16761:16761:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():804 -> a
-    16761:16761:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4705 -> a
-    16761:16761:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4907 -> a
-    16761:16761:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16762:16764:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4706:4708 -> a
-    16762:16764:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4907 -> a
-    16762:16764:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16765:16765:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4707:4707 -> a
-    16765:16765:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4907 -> a
-    16765:16765:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16766:16769:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4908:4911 -> a
-    16766:16769:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16770:16770:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    16770:16770:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694 -> a
-    16770:16770:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4910 -> a
-    16770:16770:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16771:16771:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694:3694 -> a
-    16771:16771:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4910 -> a
-    16771:16771:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4780 -> a
-    16772:16772:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4783:4783 -> a
-    16773:16794:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4918:4939 -> a
-    16773:16794:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16795:16797:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4938:4940 -> a
-    16795:16797:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16798:16798:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):844:844 -> a
-    16798:16798:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4946 -> a
-    16798:16798:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16799:16800:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4950:4951 -> a
-    16799:16800:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16801:16801:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    16801:16801:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4951 -> a
-    16801:16801:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16802:16850:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4956:5004 -> a
-    16802:16850:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16851:16851:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16851:16851:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5009 -> a
-    16851:16851:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16852:16852:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4704:4704 -> a
-    16852:16852:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5010 -> a
-    16852:16852:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16853:16853:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():818:818 -> a
-    16853:16853:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():804 -> a
-    16853:16853:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4705 -> a
-    16853:16853:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5010 -> a
-    16853:16853:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16854:16856:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4706:4708 -> a
-    16854:16856:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5010 -> a
-    16854:16856:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16857:16857:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4707:4707 -> a
-    16857:16857:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5010 -> a
-    16857:16857:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16858:16861:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5011:5014 -> a
-    16858:16861:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
+    16669:16669:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16669:16669:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4352 -> a
+    16670:16677:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4352:4359 -> a
+    16678:16678:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16678:16678:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4359 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    16679:16679:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16679:16679:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4359 -> a
+    16680:16696:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4364:4380 -> a
+    16697:16697:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16697:16697:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4380 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    16698:16698:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    16698:16698:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4380 -> a
+    16699:16715:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):4388:4404 -> a
+    16716:16716:java.util.Set lambda$trace$119(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):4320:4320 -> a
+    16717:16717:void lambda$trace$120(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4358:4358 -> a
+    16718:16718:void lambda$postProcessingDesugaring$121(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4421:4421 -> a
+    16719:16719:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
+    16719:16719:void lambda$postProcessingDesugaring$121(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4425 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    16720:16723:void lambda$postProcessingDesugaring$121(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4425:4428 -> a
+    16724:16724:void com.android.tools.r8.shaking.MissingClasses$Builder.addNewMissingClassWithDesugarDiagnostic(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,com.android.tools.r8.errors.DesugarDiagnostic):93:93 -> a
+    16724:16724:void lambda$postProcessingDesugaring$121(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):4421 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    16725:16731:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):4467:4473 -> a
+    16732:16734:void lambda$addConsequentRootSet$123(com.android.tools.r8.graph.DexType,java.util.Set):4475:4477 -> a
+    16735:16739:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):988:992 -> a
+    16735:16739:void lambda$addConsequentRootSet$123(com.android.tools.r8.graph.DexType,java.util.Set):4478 -> a
+    16740:16747:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4499:4506 -> a
+    16748:16751:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4505:4508 -> a
+    16752:16752:void identifySyntheticInterfaceMethodBridges(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction):4507:4507 -> a
+    16753:16760:void retainAnnotationForFinalTreeShaking(java.util.List):4527:4534 -> a
+    16761:16761:void retainAnnotationForFinalTreeShaking(java.util.List):4531:4531 -> a
+    16762:16762:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4566:4566 -> a
+    16763:16768:com.android.tools.r8.graph.FieldAccessInfoImpl getOrCreateFieldAccessInfo(com.android.tools.r8.graph.DexEncodedField):1051:1056 -> a
+    16763:16768:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4566 -> a
+    16769:16775:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4567:4573 -> a
+    16776:16782:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4645:4651 -> a
+    16783:16783:com.android.tools.r8.shaking.Enqueuer$Mode getMode():523:523 -> a
+    16783:16783:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4709 -> a
+    16783:16783:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4654 -> a
+    16784:16784:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4709:4709 -> a
+    16784:16784:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4654 -> a
+    16785:16785:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3900:3900 -> a
+    16785:16785:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4710 -> a
+    16785:16785:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4654 -> a
+    16786:16788:boolean mustMoveToInterfaceCompanionMethod(com.android.tools.r8.graph.ProgramMethod):3894:3896 -> a
+    16786:16788:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3901 -> a
+    16786:16788:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4710 -> a
+    16786:16788:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4654 -> a
+    16789:16804:boolean addToPendingDesugaring(com.android.tools.r8.graph.ProgramMethod):3903:3918 -> a
+    16789:16804:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4710 -> a
+    16789:16804:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4654 -> a
+    16805:16805:void traceNonDesugaredCode(com.android.tools.r8.graph.ProgramMethod):4715:4715 -> a
+    16805:16805:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4654 -> a
+    16806:16810:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4656:4660 -> a
+    16811:16811:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    16811:16811:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4660 -> a
+    16812:16812:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    16812:16812:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4662 -> a
+    16813:16813:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4662:4662 -> a
+    16814:16814:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):42:42 -> a
+    16814:16814:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4663 -> a
+    16815:16820:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition):4663:4668 -> a
+    16821:16821:void lambda$markMethodAsLive$124(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4668:4668 -> a
+    16822:16822:void lambda$markMethodAsTargeted$125(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4688:4688 -> a
+    16823:16823:void lambda$traceMethodDefinitionExcludingCode$126(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexAnnotation):4698:4698 -> a
+    16824:16824:void lambda$traceCode$127(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):4723:4723 -> a
+    16825:16825:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4749:4749 -> a
+    16826:16841:boolean addCompatInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):4775:4790 -> a
+    16826:16841:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4751 -> a
+    16842:16842:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4755:4755 -> a
+    16843:16843:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    16843:16843:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4756 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    16844:16844:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    16844:16844:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4756 -> a
+    16845:16849:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4757:4761 -> a
+    16850:16850:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():832:832 -> a
+    16850:16850:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():818 -> a
+    16850:16850:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4762 -> a
+    16851:16855:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4763:4767 -> a
+    16856:16861:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4764:4769 -> a
     16862:16862:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    16862:16862:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694 -> a
-    16862:16862:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5013 -> a
-    16862:16862:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16863:16863:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694:3694 -> a
-    16863:16863:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5013 -> a
-    16863:16863:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4784 -> a
-    16864:16864:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4787:4787 -> a
-    16865:16868:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5091:5094 -> a
-    16865:16868:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4788 -> a
-    16869:16869:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
-    16869:16869:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5095 -> a
-    16869:16869:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4788 -> a
-    16870:16870: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):50:50 -> a
-    16870:16870:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
-    16870:16870:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5095 -> a
-    16870:16870:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4788 -> a
-    16871:16871:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5095:5095 -> a
-    16871:16871:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4788 -> a
-    16872:16876:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4791:4795 -> a
-    16877:16877:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2290:2290 -> a
-    16877:16877:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4795 -> a
+    16862:16862:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706 -> a
+    16862:16862:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4768 -> a
+    16863:16863:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706:3706 -> a
+    16863:16863:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,java.util.function.Supplier):4768 -> a
+    16864:16870:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4808:4814 -> a
+    16871:16878:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4921:4928 -> a
+    16871:16878:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16879:16881:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4927:4929 -> a
+    16879:16881:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16882:16882:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):845:845 -> a
+    16882:16882:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4935 -> a
+    16882:16882:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16883:16883:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4939:4939 -> a
+    16883:16883:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16884:16884:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    16884:16884:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4941 -> a
+    16884:16884:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16885:16885:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4739:4739 -> a
+    16885:16885:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4942 -> a
+    16885:16885:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16886:16886:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():832:832 -> a
+    16886:16886:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():818 -> a
+    16886:16886:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4740 -> a
+    16886:16886:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4942 -> a
+    16886:16886:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16887:16889:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4741:4743 -> a
+    16887:16889:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4942 -> a
+    16887:16889:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16890:16890:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4742:4742 -> a
+    16890:16890:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4942 -> a
+    16890:16890:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16891:16894:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4943:4946 -> a
+    16891:16894:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16895:16895:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    16895:16895:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706 -> a
+    16895:16895:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4945 -> a
+    16895:16895:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16896:16896:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706:3706 -> a
+    16896:16896:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4945 -> a
+    16896:16896:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4815 -> a
+    16897:16897:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4818:4818 -> a
+    16898:16919:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4953:4974 -> a
+    16898:16919:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16920:16922:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4973:4975 -> a
+    16920:16922:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16923:16923:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):845:845 -> a
+    16923:16923:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4981 -> a
+    16923:16923:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16924:16925:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4985:4986 -> a
+    16924:16925:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16926:16926:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    16926:16926:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4986 -> a
+    16926:16926:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16927:16975:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4991:5039 -> a
+    16927:16975:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16976:16976:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    16976:16976:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5044 -> a
+    16976:16976:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16977:16977:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4739:4739 -> a
+    16977:16977:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5045 -> a
+    16977:16977:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16978:16978:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():832:832 -> a
+    16978:16978:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():818 -> a
+    16978:16978:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4740 -> a
+    16978:16978:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5045 -> a
+    16978:16978:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16979:16981:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4741:4743 -> a
+    16979:16981:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5045 -> a
+    16979:16981:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16982:16982:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4742:4742 -> a
+    16982:16982:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5045 -> a
+    16982:16982:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16983:16986:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5046:5049 -> a
+    16983:16986:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16987:16987:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    16987:16987:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706 -> a
+    16987:16987:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5048 -> a
+    16987:16987:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16988:16988:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706:3706 -> a
+    16988:16988:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5048 -> a
+    16988:16988:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4819 -> a
+    16989:16989:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4822:4822 -> a
+    16990:16993:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5126:5129 -> a
+    16990:16993:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4823 -> a
+    16994:16994:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> a
+    16994:16994:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5130 -> a
+    16994:16994:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4823 -> a
+    16995:16995: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):50:50 -> a
+    16995:16995:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> a
+    16995:16995:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5130 -> a
+    16995:16995:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4823 -> a
+    16996:16996:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5130:5130 -> a
+    16996:16996:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4823 -> a
+    16997:17001:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4826:4830 -> a
+    17002:17002:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2290:2290 -> a
+    17002:17002:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4830 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16878:16878:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2290:2290 -> a
-    16878:16878:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4795 -> a
-    16879:16885:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5101:5107 -> a
-    16879:16885:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16886:16886:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    16886:16886:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5107 -> a
-    16886:16886:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16887:16891:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5108:5112 -> a
-    16887:16891:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16892:16892:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16986,"2":16987,"3":16988}}
-    16986:16986:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5112:5112 -> a
-    16986:16986:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16987:16987:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5112:5112 -> a
-    16987:16987:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16988:16988:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5112:5112 -> a
-    16988:16988:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16893:16893:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":16991,"2":16992,"3":16993}}
-    16991:16991:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5115:5115 -> a
-    16991:16991:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16992:16992:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5115:5115 -> a
-    16992:16992:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16993:16993:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5115:5115 -> a
-    16993:16993:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16894:16896:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5117:5119 -> a
-    16894:16896:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16897:16897:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5112:5112 -> a
-    16897:16897:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16898:16898:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16898:16898:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5124 -> a
-    16898:16898:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16899:16899:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5124:5124 -> a
-    16899:16899:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16900:16900:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16900:16900:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5126 -> a
-    16900:16900:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16901:16902:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5127:5128 -> a
-    16901:16902:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4796 -> a
-    16903:16912:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4799:4808 -> a
-    16913:16913:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    16913:16913:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4808 -> a
-    16914:16918:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4809:4813 -> a
-    16919:16919:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):844:844 -> a
-    16919:16919:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4813 -> a
-    16920:16920:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16920:16920:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4817 -> a
-    16921:16921:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4817:4817 -> a
-    16922:16922:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():666:666 -> a
-    16922:16922:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4818 -> a
-    16923:16923:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
-    16923:16923:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():666 -> a
-    16923:16923:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4818 -> a
-    16924:16924:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():666:666 -> a
-    16924:16924:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4818 -> a
-    16925:16938:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4818:4831 -> a
-    16939:16939:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):844:844 -> a
-    16939:16939:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
-    16940:16953:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4835:4848 -> a
-    16954:16954:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16954:16954:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4849 -> a
-    16955:16964:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4848:4857 -> a
-    16965:16965:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16965:16965:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4858 -> a
-    16966:16966:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addReason(com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom):556:556 -> a
-    16966:16966:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4858 -> a
+    17003:17003:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2290:2290 -> a
+    17003:17003:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4830 -> a
+    17004:17010:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5136:5142 -> a
+    17004:17010:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17011:17011:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    17011:17011:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5142 -> a
+    17011:17011:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17012:17016:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5143:5147 -> a
+    17012:17016:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17017:17017:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":17111,"2":17112,"3":17113}}
+    17111:17111:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5147:5147 -> a
+    17111:17111:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17112:17112:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5147:5147 -> a
+    17112:17112:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17113:17113:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5147:5147 -> a
+    17113:17113:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17018:17018:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":17116,"2":17117,"3":17118}}
+    17116:17116:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5150:5150 -> a
+    17116:17116:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17117:17117:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5150:5150 -> a
+    17117:17117:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17118:17118:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5150:5150 -> a
+    17118:17118:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17019:17021:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5152:5154 -> a
+    17019:17021:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17022:17022:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5147:5147 -> a
+    17022:17022:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17023:17023:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17023:17023:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5159 -> a
+    17023:17023:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17024:17024:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5159:5159 -> a
+    17024:17024:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17025:17025:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17025:17025:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5161 -> a
+    17025:17025:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17026:17027:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):5162:5163 -> a
+    17026:17027:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4831 -> a
+    17028:17037:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4834:4843 -> a
+    17038:17038:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    17038:17038:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4843 -> a
+    17039:17043:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4844:4848 -> a
+    17044:17044:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):845:845 -> a
+    17044:17044:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4848 -> a
+    17045:17045:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17045:17045:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4852 -> a
+    17046:17046:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4852:4852 -> a
+    17047:17047:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():680:680 -> a
+    17047:17047:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4853 -> a
+    17048:17048:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
+    17048:17048:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():680 -> a
+    17048:17048:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4853 -> a
+    17049:17049:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():680:680 -> a
+    17049:17049:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4853 -> a
+    17050:17063:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4853:4866 -> a
+    17064:17064:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):845:845 -> a
+    17064:17064:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4866 -> a
+    17065:17078:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4870:4883 -> a
+    17079:17079:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17079:17079:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4884 -> a
+    17080:17089:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4883:4892 -> a
+    17090:17090:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17090:17090:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4893 -> a
+    17091:17091:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addReason(com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom):556:556 -> a
+    17091:17091:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4893 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    16967:16967:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addReason(com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom):556:556 -> a
-    16967:16967:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4858 -> a
-    16968:16968:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    16968:16968:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3644 -> a
-    16968:16968:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4853 -> a
-    16969:16969:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3644:3644 -> a
-    16969:16969:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4853 -> a
-    16970:16972:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4861:4863 -> a
-    16973:16973:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):844:844 -> a
-    16973:16973:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4864 -> a
-    16974:16974:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4868:4868 -> a
-    16975:16975:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-    16975:16975:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4872 -> a
-    16976:16983:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4873:4880 -> a
-    16984:16984:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    16984:16984:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694 -> a
-    16984:16984:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4879 -> a
-    16985:16985:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694:3694 -> a
-    16985:16985:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4879 -> a
-    16994:16994:void lambda$handleJavaLangReflectProxyNewProxyInstance$129(com.android.tools.r8.shaking.KeepClassInfo$Joiner):5061:5061 -> a
-    16995:16997:void lambda$handleJavaLangReflectProxyNewProxyInstance$131(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):5069:5071 -> a
-    16998:16998:void lambda$handleJavaLangReflectProxyNewProxyInstance$130(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):5070:5070 -> a
-    16999:17009:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5135:5145 -> a
-    17010:17010:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4704:4704 -> a
-    17010:17010:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5150 -> a
-    17011:17011:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():818:818 -> a
-    17011:17011:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():804 -> a
-    17011:17011:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4705 -> a
-    17011:17011:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5150 -> a
-    17012:17014:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4706:4708 -> a
-    17012:17014:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5150 -> a
-    17015:17015:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4707:4707 -> a
-    17015:17015:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5150 -> a
-    17016:17019:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5152:5155 -> a
-    17020:17020:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    17020:17020:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694 -> a
-    17020:17020:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5154 -> a
-    17021:17021:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694:3694 -> a
-    17021:17021:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5154 -> a
-    17022:17025:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5158:5161 -> a
-    17026:17026:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5160:5160 -> a
-    17027:17027:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):408:408 -> a
-    17027:17027:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5160 -> a
-    17028:17028:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5165:5165 -> a
-    17029:17029:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
-    17029:17029:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694 -> a
-    17029:17029:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5164 -> a
-    17030:17030:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3694:3694 -> a
-    17030:17030:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5164 -> a
-    17031:17040:com.android.tools.r8.utils.collections.DexMethodSignatureSet getServiceMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):5172:5181 -> a
+    17092:17092:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addReason(com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom):556:556 -> a
+    17092:17092:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4893 -> a
+    17093:17093:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    17093:17093:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3656 -> a
+    17093:17093:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4888 -> a
+    17094:17094:void applyMinimumKeepInfoWhenLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3656:3656 -> a
+    17094:17094:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4888 -> a
+    17095:17097:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4896:4898 -> a
+    17098:17098:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):845:845 -> a
+    17098:17098:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4899 -> a
+    17099:17099:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4903:4903 -> a
+    17100:17100:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
+    17100:17100:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4907 -> a
+    17101:17108:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4908:4915 -> a
+    17109:17109:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    17109:17109:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706 -> a
+    17109:17109:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4914 -> a
+    17110:17110:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706:3706 -> a
+    17110:17110:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):4914 -> a
+    17119:17119:void lambda$handleJavaLangReflectProxyNewProxyInstance$130(com.android.tools.r8.shaking.KeepClassInfo$Joiner):5096:5096 -> a
+    17120:17122:void lambda$handleJavaLangReflectProxyNewProxyInstance$132(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):5104:5106 -> a
+    17123:17123:void lambda$handleJavaLangReflectProxyNewProxyInstance$131(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):5105:5105 -> a
+    17124:17134:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5170:5180 -> a
+    17135:17135:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4739:4739 -> a
+    17135:17135:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5185 -> a
+    17136:17136:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():832:832 -> a
+    17136:17136:boolean com.android.tools.r8.graph.DexClass.hasDefaultInitializer():818 -> a
+    17136:17136:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4740 -> a
+    17136:17136:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5185 -> a
+    17137:17139:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4741:4743 -> a
+    17137:17139:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5185 -> a
+    17140:17140:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):4742:4742 -> a
+    17140:17140:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5185 -> a
+    17141:17144:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5187:5190 -> a
+    17145:17145:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    17145:17145:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706 -> a
+    17145:17145:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5189 -> a
+    17146:17146:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706:3706 -> a
+    17146:17146:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5189 -> a
+    17147:17150:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5193:5196 -> a
+    17151:17151:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5195:5195 -> a
+    17152:17152:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):408:408 -> a
+    17152:17152:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5195 -> a
+    17153:17153:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5200:5200 -> a
+    17154:17154:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent com.android.tools.r8.shaking.EnqueuerEvent.unconditional():16:16 -> a
+    17154:17154:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706 -> a
+    17154:17154:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5199 -> a
+    17155:17155:void applyMinimumKeepInfoWhenLiveOrTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3706:3706 -> a
+    17155:17155:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5199 -> a
+    17156:17165:com.android.tools.r8.utils.collections.DexMethodSignatureSet getServiceMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):5207:5216 -> a
     com.android.tools.r8.graph.DexApplication lambda$synthesize$108(com.android.tools.r8.graph.DexApplication) -> b
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1700(com.android.tools.r8.shaking.Enqueuer):200:200 -> b
-    2:2:void access$600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):200:200 -> b
-    3:3:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():518:518 -> b
-    4:4:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):542:542 -> b
-    5:5:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):567:567 -> b
-    6:7:void setInitialDeadProtoTypes(java.util.Set):576:577 -> b
-    8:8:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):619:619 -> b
-    9:12:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):630:633 -> b
-    13:14:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):688:689 -> b
-    13:14:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):637 -> b
-    15:15:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):717:717 -> b
-    16:16:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):721:721 -> b
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1700(com.android.tools.r8.shaking.Enqueuer):201:201 -> b
+    2:2:void access$600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):201:201 -> b
+    3:3:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():519:519 -> b
+    4:4:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):543:543 -> b
+    5:5:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):568:568 -> b
+    6:7:void setInitialDeadProtoTypes(java.util.Set):577:578 -> b
+    8:8:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):620:620 -> b
+    9:12:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):631:634 -> b
+    13:14:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):689:690 -> b
+    13:14:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):638 -> b
+    15:15:com.android.tools.r8.shaking.KeepClassInfo getKeepInfo(com.android.tools.r8.graph.DexProgramClass):718:718 -> b
+    16:16:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):722:722 -> b
     17:17:com.android.tools.r8.shaking.KeepFieldInfo com.android.tools.r8.shaking.KeepInfoCollection.getFieldInfo(com.android.tools.r8.graph.ProgramField):118:118 -> b
-    17:17:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):721 -> b
-    18:18:com.android.tools.r8.graph.DexClass getClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):838:838 -> b
-    19:20:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):688:689 -> b
-    19:20:com.android.tools.r8.graph.DexClass getClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):838 -> b
-    21:21:void traceReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1035:1035 -> b
-    22:22:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1014:1014 -> b
-    22:22:void traceReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1036 -> b
+    17:17:com.android.tools.r8.shaking.KeepFieldInfo getKeepInfo(com.android.tools.r8.graph.ProgramField):722 -> b
+    18:18:com.android.tools.r8.graph.DexClass getClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):839:839 -> b
+    19:20:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext,java.util.function.BiConsumer,java.util.function.BiConsumer):689:690 -> b
+    19:20:com.android.tools.r8.graph.DexClass getClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):839 -> b
+    21:21:void traceReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1036:1036 -> b
+    22:22:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1015:1015 -> b
+    22:22:void traceReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1037 -> b
     23:23:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> b
-    23:23:void traceReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1037 -> b
-    24:24:void traceReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1037:1037 -> b
-    25:26:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1170:1171 -> b
-    27:27:void lambda$traceExceptionGuard$16(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1357:1357 -> b
-    28:28:void lambda$traceInvokeDirect$17(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1366:1366 -> b
-    29:31:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1416:1416 -> b
-    35:36:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1420:1421 -> b
+    23:23:void traceReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1038 -> b
+    24:24:void traceReflectiveFieldRead(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1038:1038 -> b
+    25:26:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):1177:1178 -> b
+    27:27:void lambda$traceExceptionGuard$16(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1364:1364 -> b
+    28:28:void lambda$traceInvokeDirect$17(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1373:1373 -> b
+    29:31:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1423:1423 -> b
+    35:36:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1427:1428 -> b
     37:37:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    37:37:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1421 -> b
-    38:39:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1423:1424 -> b
-    40:40:void lambda$traceInvokeInterface$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1424:1424 -> b
-    41:41:void lambda$traceNewInstance$25(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1515:1515 -> b
-    42:42:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1716:1716 -> b
-    43:43:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1018:1018 -> b
-    43:43:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1716 -> b
-    44:55:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1720:1731 -> b
+    37:37:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1428 -> b
+    38:39:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1430:1431 -> b
+    40:40:void lambda$traceInvokeInterface$21(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1431:1431 -> b
+    41:41:void lambda$traceNewInstance$25(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1522:1522 -> b
+    42:42:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1723:1723 -> b
+    43:43:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1019:1019 -> b
+    43:43:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1723 -> b
+    44:55:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1727:1738 -> b
     56:56:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):124:124 -> b
-    56:56:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1731 -> b
-    57:68:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1733:1744 -> b
+    56:56:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1738 -> b
+    57:68:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1740:1751 -> b
     69:69:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1834,"2":1835,"3":1836}}
-    1834:1834:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1744:1744 -> b
-    1835:1835:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1744:1744 -> b
-    1836:1836:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1744:1744 -> b
-    1815:1824:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1746:1755 -> b
-    1825:1825:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    1825:1825:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1755 -> b
-    1826:1828:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1758:1760 -> b
-    1829:1831:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1999:2001 -> b
-    1829:1831:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1760 -> b
-    1832:1832:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> b
-    1832:1832:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1763 -> b
-    1833:1833:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1764:1764 -> b
-    1837:1837:void lambda$traceInstanceFieldWrite$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1735:1735 -> b
-    1838:1838:java.lang.Boolean lambda$traceStaticFieldWrite$37(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1878:1878 -> b
-    1839:1840:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.isDeadProtoExtensionField(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):245:246 -> b
-    1839:1840:java.lang.Boolean lambda$traceStaticFieldWrite$37(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1878 -> b
-    1841:1841:java.lang.Boolean lambda$traceStaticFieldWrite$37(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1878:1878 -> b
-    1842:1842:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$48(com.android.tools.r8.graph.DexType):2168:2168 -> b
-    1843:1843:void lambda$ensureMethodsContinueToWidenAccess$50(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):2179:2179 -> b
-    1844:1881:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2184:2221 -> b
-    1882:1882:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2006:2006 -> b
-    1882:1882:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2224 -> b
-    1883:1883:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2222:2222 -> b
-    1884:1884:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2006:2006 -> b
-    1884:1884:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2192 -> b
-    1885:1916:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2483:2514 -> b
-    1885:1916:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2478 -> b
-    1917:1919:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2610:2612 -> b
-    1920:1924:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):747:751 -> b
-    1920:1924:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2611 -> b
-    1925:1925:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2732:2732 -> b
-    1926:1926:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> b
-    1926:1926:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2732 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1841,"2":1842,"3":1843}}
+    1841:1841:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1751:1751 -> b
+    1842:1842:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1751:1751 -> b
+    1843:1843:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1751:1751 -> b
+    1822:1831:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1753:1762 -> b
+    1832:1832:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    1832:1832:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1762 -> b
+    1833:1835:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1765:1767 -> b
+    1836:1838:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2006:2008 -> b
+    1836:1838:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1767 -> b
+    1839:1839:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> b
+    1839:1839:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1770 -> b
+    1840:1840:void lambda$traceInstanceFieldWrite$30(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1771:1771 -> b
+    1844:1844:void lambda$traceInstanceFieldWrite$29(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1742:1742 -> b
+    1845:1845:java.lang.Boolean lambda$traceStaticFieldWrite$37(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1885:1885 -> b
+    1846:1847:boolean com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker.isDeadProtoExtensionField(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.shaking.KeepInfoCollection):245:246 -> b
+    1846:1847:java.lang.Boolean lambda$traceStaticFieldWrite$37(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1885 -> b
+    1848:1848:java.lang.Boolean lambda$traceStaticFieldWrite$37(com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1885:1885 -> b
+    1849:1849:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$48(com.android.tools.r8.graph.DexType):2180:2180 -> b
+    1850:1850:void lambda$ensureMethodsContinueToWidenAccess$50(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):2191:2191 -> b
+    1851:1888:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2196:2233 -> b
+    1889:1889:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2013:2013 -> b
+    1889:1889:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2236 -> b
+    1890:1890:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2234:2234 -> b
+    1891:1891:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2013:2013 -> b
+    1891:1891:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):2204 -> b
+    1892:1923:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2495:2526 -> b
+    1892:1923:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2490 -> b
+    1924:1926:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2622:2624 -> b
+    1927:1931:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):748:752 -> b
+    1927:1931:void recordNonProgramClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2623 -> b
+    1932:1932:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2744:2744 -> b
+    1933:1933:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> b
+    1933:1933:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2744 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1927:1927:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> b
-    1927:1927:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2732 -> b
-    1928:1933:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2732:2737 -> b
-    1934:1935:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2995:2996 -> b
-    1934:1935:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2738 -> b
-    1936:1938:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3091:3093 -> b
-    1939:1939:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3092:3092 -> b
-    1940:1941:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> b
-    1940:1941:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3092 -> b
-    1942:1948:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3094:3100 -> b
-    1949:1949:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3112:3112 -> b
-    1949:1949:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3106 -> b
-    1950:1950:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2006:2006 -> b
-    1950:1950:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3112 -> b
-    1950:1950:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3106 -> b
-    1951:1951:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3113:3113 -> b
-    1951:1951:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3106 -> b
-    1952:1952:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2241:2241 -> b
-    1952:1952:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> b
-    1952:1952:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3106 -> b
-    1953:1953:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> b
-    1953:1953:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2242 -> b
-    1953:1953:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> b
-    1953:1953:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3106 -> b
-    1954:1954:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2247:2247 -> b
-    1954:1954:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2239 -> b
-    1954:1954:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> b
-    1954:1954:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3106 -> b
-    1955:1956:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2252:2253 -> b
-    1955:1956:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2247 -> b
-    1955:1956:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2239 -> b
-    1955:1956:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3114 -> b
-    1955:1956:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3106 -> b
-    1957:1957:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3108:3108 -> b
-    1958:1958:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3102:3102 -> b
-    1959:1960:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):3121:3122 -> b
-    1959:1960:void lambda$traceInstanceFieldWrite$31(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1768 -> b
-    1961:1961:void lambda$traceInstanceFieldWrite$31(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1769:1769 -> b
-    1962:1962:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):3148:3148 -> b
-    1963:1964:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):3171:3172 -> b
-    1965:1965:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3223:3223 -> b
-    1966:1966:boolean lambda$markVirtualMethodAsReachable$82(com.android.tools.r8.graph.DexDefinition):3350:3350 -> b
-    1967:1967:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
-    1967:1967:boolean lambda$markVirtualMethodAsReachable$82(com.android.tools.r8.graph.DexDefinition):3350 -> b
+    1934:1934:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> b
+    1934:1934:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2744 -> b
+    1935:1940:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2744:2749 -> b
+    1941:1942:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):3007:3008 -> b
+    1941:1942:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2750 -> b
+    1943:1945:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3103:3105 -> b
+    1946:1946:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3104:3104 -> b
+    1947:1948:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> b
+    1947:1948:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3104 -> b
+    1949:1955:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3106:3112 -> b
+    1956:1956:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3124:3124 -> b
+    1956:1956:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3118 -> b
+    1957:1957:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2013:2013 -> b
+    1957:1957:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3124 -> b
+    1957:1957:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3118 -> b
+    1958:1958:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3125:3125 -> b
+    1958:1958:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3118 -> b
+    1959:1959:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2253:2253 -> b
+    1959:1959:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> b
+    1959:1959:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3118 -> b
+    1960:1960:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> b
+    1960:1960:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2254 -> b
+    1960:1960:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> b
+    1960:1960:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3118 -> b
+    1961:1961:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2259:2259 -> b
+    1961:1961:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2251 -> b
+    1961:1961:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> b
+    1961:1961:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3118 -> b
+    1962:1963:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2264:2265 -> b
+    1962:1963:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2259 -> b
+    1962:1963:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2251 -> b
+    1962:1963:void traceFieldDefinition(com.android.tools.r8.graph.ProgramField):3126 -> b
+    1962:1963:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3118 -> b
+    1964:1964:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3120:3120 -> b
+    1965:1965:void markFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):3114:3114 -> b
+    1966:1967:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):3133:3134 -> b
+    1966:1967:void lambda$traceInstanceFieldWrite$31(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1775 -> b
+    1968:1968:void lambda$traceInstanceFieldWrite$31(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1776:1776 -> b
+    1969:1969:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):3160:3160 -> b
+    1970:1971:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):3183:3184 -> b
+    1972:1972:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3235:3235 -> b
+    1973:1973:boolean lambda$markVirtualMethodAsReachable$82(com.android.tools.r8.graph.DexDefinition):3362:3362 -> b
+    1974:1974:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
+    1974:1974:boolean lambda$markVirtualMethodAsReachable$82(com.android.tools.r8.graph.DexDefinition):3362 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1968:1968:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
-    1968:1968:boolean lambda$markVirtualMethodAsReachable$82(com.android.tools.r8.graph.DexDefinition):3350 -> b
-    1969:1973:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3409:3413 -> b
-    1969:1973:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3421 -> b
-    1974:1974:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1991,"2":1992,"3":1993}}
-    1991:1991:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3413:3413 -> b
-    1991:1991:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3421 -> b
-    1992:1992:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3413:3413 -> b
-    1992:1992:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3421 -> b
-    1993:1993:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3413:3413 -> b
-    1993:1993:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3421 -> b
-    1975:1975:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3413:3413 -> b
-    1975:1975:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3421 -> b
-    1976:1981:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3412:3417 -> b
-    1976:1981:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3421 -> b
-    1982:1987:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3421:3426 -> b
-    1988:1988:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2575:2575 -> b
-    1988:1988:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3429 -> b
-    1989:1989:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():670:670 -> b
-    1989:1989:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2575 -> b
+    1975:1975:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):160:160 -> b
+    1975:1975:boolean lambda$markVirtualMethodAsReachable$82(com.android.tools.r8.graph.DexDefinition):3362 -> b
+    1976:1980:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3421:3425 -> b
+    1976:1980:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3433 -> b
+    1981:1981:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1998,"2":1999,"3":2000}}
+    1998:1998:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3425:3425 -> b
+    1998:1998:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3433 -> b
+    1999:1999:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3425:3425 -> b
+    1999:1999:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3433 -> b
+    2000:2000:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3425:3425 -> b
+    2000:2000:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3433 -> b
+    1982:1982:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3425:3425 -> b
+    1982:1982:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3433 -> b
+    1983:1988:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):3424:3429 -> b
+    1983:1988:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3433 -> b
+    1989:1994:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3433:3438 -> b
+    1995:1995:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2587:2587 -> b
+    1995:1995:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3441 -> b
+    1996:1996:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():675:675 -> b
+    1996:1996:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2587 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1989:1989:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3429 -> b
-    1990:1990:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2576:2576 -> b
-    1990:1990:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3429 -> b
-    1994:1994:void lambda$markEnumValuesAsReachable$91(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3428:3428 -> b
-    1995:2005:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3494:3504 -> b
-    2006:2006:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():223:223 -> b
-    2006:2006:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3504 -> b
-    2007:2010:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3505:3508 -> b
-    2011:2011:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():231:231 -> b
-    2011:2011:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3508 -> b
-    2012:2016:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3507:3511 -> b
-    2017:2017:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):406:406 -> b
-    2017:2017:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3512 -> b
-    2018:2018:void lambda$applyMinimumKeepInfoWhenLive$100(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3596:3596 -> b
-    2019:2019:void lambda$applyMinimumKeepInfoWhenLive$102(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3650:3650 -> b
-    2020:2020:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$104(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3702:3702 -> b
-    2021:2021:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3715:3715 -> b
-    2022:2022:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> b
-    2022:2022:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3716 -> b
+    1996:1996:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3441 -> b
+    1997:1997:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2588:2588 -> b
+    1997:1997:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3441 -> b
+    2001:2001:void lambda$markEnumValuesAsReachable$91(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3440:3440 -> b
+    2002:2012:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3506:3516 -> b
+    2013:2013:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isInitialMainDexTracing():224:224 -> b
+    2013:2013:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3516 -> b
+    2014:2017:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3517:3520 -> b
+    2018:2018:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isGenerateMainDexList():232:232 -> b
+    2018:2018:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3520 -> b
+    2019:2023:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3519:3523 -> b
+    2024:2024:com.android.tools.r8.shaking.MainDexInfo com.android.tools.r8.shaking.MainDexInfo$Builder.build(com.android.tools.r8.shaking.MainDexInfo):406:406 -> b
+    2024:2024:com.android.tools.r8.shaking.MainDexInfo traceMainDex(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3524 -> b
+    2025:2025:void lambda$applyMinimumKeepInfoWhenLive$100(com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3608:3608 -> b
+    2026:2026:void lambda$applyMinimumKeepInfoWhenLive$102(com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3662:3662 -> b
+    2027:2027:void lambda$applyMinimumKeepInfoWhenLiveOrTargeted$104(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3714:3714 -> b
+    2028:2028:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3727:3727 -> b
+    2029:2029:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> b
+    2029:2029:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3728 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2023:2023:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> b
-    2023:2023:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3716 -> b
-    2024:2024:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3717:3717 -> b
-    2025:2027:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):957:959 -> b
-    2025:2027:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3718 -> b
-    2028:2028:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> b
-    2028:2028:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):962 -> b
+    2030:2030:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> b
+    2030:2030:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3728 -> b
+    2031:2031:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3729:3729 -> b
+    2032:2034:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):958:960 -> b
+    2032:2034:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3730 -> b
+    2035:2035:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> b
+    2035:2035:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):963 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2028:2028:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3718 -> b
-    2029:2029:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):962:962 -> b
-    2029:2029:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3718 -> b
-    2030:2030:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):961:961 -> b
-    2030:2030:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3718 -> b
-    2031:2031:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):959:959 -> b
-    2031:2031:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3718 -> b
-    2032:2032:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3720:3720 -> b
-    2033:2033:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> b
-    2033:2033:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3721 -> b
-    2034:2035:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):2234:2235 -> b
-    2034:2035:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3721 -> b
-    2036:2036:void lambda$applyMinimumKeepInfoDependentOn$105(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3750:3750 -> b
-    2037:2037:void lambda$applyMinimumKeepInfoDependentOn$106(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3752:3752 -> b
-    2038:2040:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):3991:3993 -> b
-    2041:2045:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):4764:4768 -> b
-    2046:2046:void lambda$handleReflectiveBehavior$128(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4827:4827 -> b
+    2035:2035:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3730 -> b
+    2036:2036:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):963:963 -> b
+    2036:2036:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3730 -> b
+    2037:2037:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):962:962 -> b
+    2037:2037:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3730 -> b
+    2038:2038:void enqueueMethodDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):960:960 -> b
+    2038:2038:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3730 -> b
+    2039:2039:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3732:3732 -> b
+    2040:2040:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> b
+    2040:2040:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3733 -> b
+    2041:2042:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):2246:2247 -> b
+    2041:2042:void enqueueMethodIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3733 -> b
+    2043:2043:void lambda$applyMinimumKeepInfoDependentOn$105(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3762:3762 -> b
+    2044:2044:void lambda$applyMinimumKeepInfoDependentOn$106(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3764:3764 -> b
+    2045:2047:void recordTwrCloseResourceMethodSynthesizingContext(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):4024:4026 -> b
+    2048:2052:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):4799:4803 -> b
+    2053:2053:void lambda$handleReflectiveBehavior$129(com.android.tools.r8.shaking.KeepClassInfo$Joiner):4862:4862 -> b
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.ProgramMethod):79:79 -> c
-    1:1:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3435 -> c
-    2:3:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3436:3437 -> c
-    4:4:com.android.tools.r8.utils.InternalOptions access$1900(com.android.tools.r8.shaking.Enqueuer):200:200 -> c
-    5:5:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):557:557 -> c
-    6:7:void setInitialPrunedTypes(java.util.Set):581:582 -> c
-    8:13:boolean hasAlternativeLibraryDefinition(com.android.tools.r8.graph.DexProgramClass):674:679 -> c
-    14:15:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):827:828 -> c
-    16:16:void traceReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1042:1042 -> c
-    17:17:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1022:1022 -> c
-    17:17:void traceReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1043 -> c
+    1:1:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3447 -> c
+    2:3:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):3448:3449 -> c
+    4:4:com.android.tools.r8.utils.InternalOptions access$1900(com.android.tools.r8.shaking.Enqueuer):201:201 -> c
+    5:5:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):558:558 -> c
+    6:7:void setInitialPrunedTypes(java.util.Set):582:583 -> c
+    8:13:boolean hasAlternativeLibraryDefinition(com.android.tools.r8.graph.DexProgramClass):675:680 -> c
+    14:15:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):828:829 -> c
+    16:16:void traceReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1043:1043 -> c
+    17:17:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1023:1023 -> c
+    17:17:void traceReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1044 -> c
     18:18:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> c
-    18:18:void traceReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1044 -> c
-    19:19:void traceReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1044:1044 -> c
-    20:20:void lambda$traceInstanceOf$15(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1352:1352 -> c
-    21:21:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1357:1357 -> c
-    22:22:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1348:1348 -> c
-    22:22:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1358 -> c
-    23:24:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1437:1438 -> c
+    18:18:void traceReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1045 -> c
+    19:19:void traceReflectiveFieldWrite(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):1045:1045 -> c
+    20:20:void lambda$traceInstanceOf$15(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1359:1359 -> c
+    21:21:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1364:1364 -> c
+    22:22:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1355:1355 -> c
+    22:22:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1365 -> c
+    23:24:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1444:1445 -> c
     25:25:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1685:1685 -> c
-    25:25:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1438 -> c
+    25:25:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1445 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     26:26:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1685:1685 -> c
-    26:26:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1438 -> c
-    27:39:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1438:1450 -> c
+    26:26:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1445 -> c
+    27:39:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1445:1457 -> c
     40:40:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2290:2290 -> c
-    40:40:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1450 -> c
+    40:40:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1457 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     41:41:boolean com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods.isLoadMethod(com.android.tools.r8.graph.DexMethod):2290:2290 -> c
-    41:41:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1450 -> c
-    42:48:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1451:1457 -> c
-    49:54:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1456:1461 -> c
+    41:41:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1457 -> c
+    42:48:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1458:1464 -> c
+    49:54:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1463:1468 -> c
     55:55:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    55:55:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1461 -> c
-    56:57:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1463:1464 -> c
-    58:58:void lambda$traceInvokeStatic$22(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1464:1464 -> c
-    59:59:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1783:1783 -> c
-    60:60:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1010:1010 -> c
-    60:60:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1783 -> c
-    61:70:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1787:1796 -> c
-    71:77:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1792:1798 -> c
-    78:78:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):593:593 -> c
-    78:78:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1798 -> c
-    79:85:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1803:1809 -> c
+    55:55:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1468 -> c
+    56:57:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1470:1471 -> c
+    58:58:void lambda$traceInvokeStatic$22(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1471:1471 -> c
+    59:59:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1790:1790 -> c
+    60:60:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1011:1011 -> c
+    60:60:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1790 -> c
+    61:70:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1794:1803 -> c
+    71:77:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1799:1805 -> c
+    78:78:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):594:594 -> c
+    78:78:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1805 -> c
+    79:85:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1810:1816 -> c
     86:86:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):124:124 -> c
-    86:86:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1809 -> c
-    87:98:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1811:1822 -> c
+    86:86:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1816 -> c
+    87:98:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1818:1829 -> c
     99:99:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1944,"2":1945,"3":1946}}
-    1944:1944:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1822:1822 -> c
-    1945:1945:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1822:1822 -> c
-    1946:1946:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1822:1822 -> c
-    1923:1932:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1824:1833 -> c
-    1933:1933:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    1933:1933:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1833 -> c
-    1934:1938:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1836:1840 -> c
-    1939:1941:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1999:2001 -> c
-    1939:1941:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1840 -> c
-    1942:1942:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> c
-    1942:1942:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3053 -> c
-    1942:1942:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1843 -> c
-    1943:1943:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3053:3053 -> c
-    1943:1943:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1843 -> c
-    1947:1947:void lambda$traceStaticFieldRead$33(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1813:1813 -> c
-    1948:1952:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2010:2014 -> c
-    1953:1955:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2013:2015 -> c
-    1956:1956:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2011:2011 -> c
-    1957:1957:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$41(com.android.tools.r8.graph.DexType):2014:2014 -> c
-    1958:1960:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2319:2321 -> c
-    1961:1961:void com.android.tools.r8.graph.MethodResolutionResult.visitMethodResolutionResults(java.util.function.Consumer,java.util.function.Consumer):202:202 -> c
-    1961:1961:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2321 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1951,"2":1952,"3":1953}}
+    1951:1951:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1829:1829 -> c
+    1952:1952:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1829:1829 -> c
+    1953:1953:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1829:1829 -> c
+    1930:1939:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1831:1840 -> c
+    1940:1940:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    1940:1940:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1840 -> c
+    1941:1945:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1843:1847 -> c
+    1946:1948:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2006:2008 -> c
+    1946:1948:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1847 -> c
+    1949:1949:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> c
+    1949:1949:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3065 -> c
+    1949:1949:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1850 -> c
+    1950:1950:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3065:3065 -> c
+    1950:1950:void lambda$traceStaticFieldRead$34(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1850 -> c
+    1954:1954:void lambda$traceStaticFieldRead$33(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1820:1820 -> c
+    1955:1959:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2017:2021 -> c
+    1960:1962:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2020:2022 -> c
+    1963:1963:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2018:2018 -> c
+    1964:1964:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$41(com.android.tools.r8.graph.DexType):2021:2021 -> c
+    1965:1967:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2331:2333 -> c
+    1968:1968:void com.android.tools.r8.graph.MethodResolutionResult.visitMethodResolutionResults(java.util.function.Consumer,java.util.function.Consumer):202:202 -> c
+    1968:1968:com.android.tools.r8.graph.MethodResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):2333 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1962:1964:void recordNonProgramClassWithNoMissingReporting(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2621:2623 -> c
-    1965:1969:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):747:751 -> c
-    1965:1969:void recordNonProgramClassWithNoMissingReporting(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2622 -> c
-    1970:1976:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2645:2645 -> c
-    1977:1977:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4648,"2":4649,"3":4650}}
-    4648:4648:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2645:2645 -> c
-    4649:4649:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2645:2645 -> c
-    4650:4650:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2645:2645 -> c
-    1978:1978:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4656,"2":4657,"3":4658,"4":4659}}
-    4656:4656:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2651:2651 -> c
-    4657:4657:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2651:2651 -> c
-    4658:4658:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2651:2651 -> c
-    4659:4659:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2651:2651 -> c
-    4629:4642:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2651:2664 -> c
-    4643:4643:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404:404 -> c
-    4643:4643:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2664 -> c
-    4644:4644:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):400:400 -> c
-    4644:4644:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404 -> c
-    4644:4644:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2664 -> c
-    4645:4647:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2665:2667 -> c
-    4660:4661:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):3121:3122 -> c
-    4660:4661:void lambda$traceStaticFieldRead$36(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1847 -> c
-    4662:4664:void lambda$traceStaticFieldRead$36(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1848:1850 -> c
-    4665:4673:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3126:3134 -> c
-    4674:4676:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1955:1957 -> c
-    4674:4676:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3134 -> c
-    4677:4677:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3135:3135 -> c
-    4678:4678:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):3157:3157 -> c
-    4679:4679:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3227:3227 -> c
-    4680:4680:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3223:3223 -> c
-    4680:4680:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3227 -> c
-    4681:4681:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$93(com.android.tools.r8.graph.DexEncodedMethod):3479:3479 -> c
-    4682:4682:void lambda$traceApplication$96(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3547:3547 -> c
-    4683:4683:void lambda$traceApplication$97(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3549:3549 -> c
-    4684:4684:void lambda$applyMinimumKeepInfoDependentOn$107(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3754:3754 -> c
-    4685:4691:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):4183:4189 -> c
-    4692:4703:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4219:4230 -> c
-    4692:4703:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):4189 -> c
-    4704:4704:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3223:3223 -> c
-    4704:4704:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4231 -> c
-    4704:4704:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):4189 -> c
-    4705:4705:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4232:4232 -> c
-    4705:4705:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):4189 -> c
-    4706:4708:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4241:4243 -> c
-    4706:4708:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4232 -> c
-    4706:4708:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):4189 -> c
-    4709:4709:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4453:4453 -> c
-    4710:4710: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):2056:2056 -> c
-    4710:4710:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4453 -> c
-    4711:4712:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4454:4455 -> c
-    4713:4722:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4483:4492 -> c
-    4713:4722:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4456 -> c
-    4723:4723:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4460:4460 -> c
+    1969:1971:void recordNonProgramClassWithNoMissingReporting(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2633:2635 -> c
+    1972:1976:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):748:752 -> c
+    1972:1976:void recordNonProgramClassWithNoMissingReporting(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):2634 -> c
+    1977:1983:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2657:2657 -> c
+    1984:1984:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4667,"2":4668,"3":4669}}
+    4667:4667:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2657:2657 -> c
+    4668:4668:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2657:2657 -> c
+    4669:4669:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2657:2657 -> c
+    1985:1985:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):0:0 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4675,"2":4676,"3":4677,"4":4678}}
+    4675:4675:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2663:2663 -> c
+    4676:4676:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2663:2663 -> c
+    4677:4677:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2663:2663 -> c
+    4678:4678:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2663:2663 -> c
+    4648:4661:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2663:2676 -> c
+    4662:4662:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404:404 -> c
+    4662:4662:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2676 -> c
+    4663:4663:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):400:400 -> c
+    4663:4663:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404 -> c
+    4663:4663:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2676 -> c
+    4664:4666:void reportMissingClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):2677:2679 -> c
+    4679:4680:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):3133:3134 -> c
+    4679:4680:void lambda$traceStaticFieldRead$36(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1854 -> c
+    4681:4683:void lambda$traceStaticFieldRead$36(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1855:1857 -> c
+    4684:4692:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3138:3146 -> c
+    4693:4695:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1962:1964 -> c
+    4693:4695:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3146 -> c
+    4696:4696:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3147:3147 -> c
+    4697:4697:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):3169:3169 -> c
+    4698:4698:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3239:3239 -> c
+    4699:4699:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3235:3235 -> c
+    4699:4699:boolean isMethodTargeted(com.android.tools.r8.graph.ProgramMethod):3239 -> c
+    4700:4700:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$93(com.android.tools.r8.graph.DexEncodedMethod):3491:3491 -> c
+    4701:4701:void lambda$traceApplication$96(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3559:3559 -> c
+    4702:4702:void lambda$traceApplication$97(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3561:3561 -> c
+    4703:4703:void lambda$applyMinimumKeepInfoDependentOn$107(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3766:3766 -> c
+    4704:4710:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):4214:4220 -> c
+    4711:4722:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4250:4261 -> c
+    4711:4722:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):4220 -> c
+    4723:4723:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):3235:3235 -> c
+    4723:4723:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4262 -> c
+    4723:4723:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):4220 -> c
+    4724:4724:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4263:4263 -> c
+    4724:4724:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):4220 -> c
+    4725:4727:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4272:4274 -> c
+    4725:4727:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):4263 -> c
+    4725:4727:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):4220 -> c
+    4728:4728:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4484:4484 -> c
+    4729:4729: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):2142:2142 -> c
+    4729:4729:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4484 -> c
+    4730:4731:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4485:4486 -> c
+    4732:4741:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):4514:4523 -> c
+    4732:4741:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4487 -> c
+    4742:4742:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():4491:4491 -> c
     1:1:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> d
-    1:1:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$127(com.android.tools.r8.graph.ProgramMethod):4820 -> d
-    2:2:com.android.tools.r8.shaking.Enqueuer$Mode access$200(com.android.tools.r8.shaking.Enqueuer):200:200 -> d
-    3:7:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():530:534 -> d
-    8:8:void lambda$traceSafeCheckCast$12(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1175:1175 -> d
-    9:20:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1265:1276 -> d
-    21:27:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1313:1319 -> d
-    21:27:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1276 -> d
-    28:28:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1275:1275 -> d
-    29:29:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2006:2006 -> d
-    29:29:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1278 -> d
-    30:30:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1279:1279 -> d
+    1:1:com.android.tools.r8.shaking.KeepReason lambda$handleReflectiveBehavior$128(com.android.tools.r8.graph.ProgramMethod):4855 -> d
+    2:2:com.android.tools.r8.shaking.Enqueuer$Mode access$200(com.android.tools.r8.shaking.Enqueuer):201:201 -> d
+    3:7:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():531:535 -> d
+    8:8:void lambda$traceSafeCheckCast$12(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):1182:1182 -> d
+    9:20:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1272:1283 -> d
+    21:27:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1320:1326 -> d
+    21:27:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1283 -> d
+    28:28:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1282:1282 -> d
+    29:29:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2013:2013 -> d
+    29:29:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1285 -> d
+    30:30:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1286:1286 -> d
     31:31:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> d
-    31:31:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1283 -> d
-    32:32:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1288:1288 -> d
-    33:37:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1313:1317 -> d
-    33:37:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1288 -> d
-    38:38:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1291:1291 -> d
+    31:31:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1290 -> d
+    32:32:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1295:1295 -> d
+    33:37:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1320:1324 -> d
+    33:37:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1295 -> d
+    38:38:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1298:1298 -> d
     39:39:boolean com.android.tools.r8.utils.Visibility.isPrivate():20:20 -> d
-    39:39:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1291 -> d
-    40:43:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1291:1294 -> d
+    39:39:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1298 -> d
+    40:43:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1298:1301 -> d
     44:44:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> d
-    44:44:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1298 -> d
-    45:45:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1303:1303 -> d
+    44:44:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1305 -> d
+    45:45:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1310:1310 -> d
     46:46:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> d
-    46:46:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1307 -> d
-    47:47:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1307:1307 -> d
+    46:46:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1314 -> d
+    47:47:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1314:1314 -> d
     48:48:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> d
-    48:48:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1308 -> d
-    49:49:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1308:1308 -> d
-    50:56:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1362:1368 -> d
+    48:48:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1315 -> d
+    49:49:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1315:1315 -> d
+    50:56:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1369:1375 -> d
     57:57:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> d
-    57:57:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1372 -> d
+    57:57:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1379 -> d
     58:58:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):50:50 -> d
     58:58:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> d
-    58:58:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1372 -> d
-    59:59:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1372:1372 -> d
-    60:60:void lambda$traceInvokeSuper$23(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1479:1479 -> d
-    61:68:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1492:1499 -> d
-    69:77:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1494:1502 -> d
-    78:83:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1501:1506 -> d
+    58:58:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1379 -> d
+    59:59:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1379:1379 -> d
+    60:60:void lambda$traceInvokeSuper$23(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1486:1486 -> d
+    61:68:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1499:1506 -> d
+    69:77:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1501:1509 -> d
+    78:83:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1508:1513 -> d
     84:84:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    84:84:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1506 -> d
-    85:86:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1508:1509 -> d
-    87:87:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1867:1867 -> d
-    88:88:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1018:1018 -> d
-    88:88:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1867 -> d
-    89:98:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1871:1880 -> d
-    99:105:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1876:1882 -> d
-    106:106:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):593:593 -> d
-    106:106:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1882 -> d
-    107:113:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1887:1893 -> d
+    84:84:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1513 -> d
+    85:86:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1515:1516 -> d
+    87:87:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1874:1874 -> d
+    88:88:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1019:1019 -> d
+    88:88:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1874 -> d
+    89:98:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1878:1887 -> d
+    99:105:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1883:1889 -> d
+    106:106:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):594:594 -> d
+    106:106:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1889 -> d
+    107:113:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1894:1900 -> d
     114:114:void com.android.tools.r8.graph.FieldResolutionResult.visitFieldResolutionResults(java.util.function.Consumer,java.util.function.Consumer):124:124 -> d
-    114:114:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1893 -> d
-    115:126:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1895:1906 -> d
+    114:114:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1900 -> d
+    115:126:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1902:1913 -> d
     127:127:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):0:0 -> d
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2056,"2":2057,"3":2058}}
-    2056:2056:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1906:1906 -> d
-    2057:2057:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1906:1906 -> d
-    2058:2058:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1906:1906 -> d
-    2035:2044:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1908:1917 -> d
-    2045:2045:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    2045:2045:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1917 -> d
-    2046:2050:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1920:1924 -> d
-    2051:2053:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):1999:2001 -> d
-    2051:2053:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1924 -> d
-    2054:2054:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> d
-    2054:2054:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3053 -> d
-    2054:2054:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1927 -> d
-    2055:2055:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3053:3053 -> d
-    2055:2055:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1927 -> d
-    2059:2059:void lambda$traceStaticFieldWrite$38(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1897:1897 -> d
-    2060:2068:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1967:1975 -> d
-    2069:2069:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2006:2006 -> d
-    2069:2069:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1979 -> d
-    2070:2070:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$42(com.android.tools.r8.graph.DexType):2091:2091 -> d
-    2071:2072:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):3121:3122 -> d
-    2071:2072:void lambda$traceStaticFieldWrite$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1931 -> d
-    2073:2073:void lambda$traceStaticFieldWrite$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1932:1932 -> d
-    2074:2075:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):3165:3166 -> d
-    2076:2076:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):3237:3237 -> d
-    2077:2082:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3620:3625 -> d
-    2083:2083:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> d
-    2083:2083:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3625 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2063,"2":2064,"3":2065}}
+    2063:2063:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1913:1913 -> d
+    2064:2064:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1913:1913 -> d
+    2065:2065:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1913:1913 -> d
+    2042:2051:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1915:1924 -> d
+    2052:2052:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    2052:2052:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1924 -> d
+    2053:2057:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1927:1931 -> d
+    2058:2060:void markTypeAsLive(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition):2006:2008 -> d
+    2058:2060:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1931 -> d
+    2061:2061:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):62:62 -> d
+    2061:2061:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3065 -> d
+    2061:2061:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1934 -> d
+    2062:2062:void markFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):3065:3065 -> d
+    2062:2062:void lambda$traceStaticFieldWrite$39(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult):1934 -> d
+    2066:2066:void lambda$traceStaticFieldWrite$38(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$SingleFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerFieldAccessAnalysis):1904:1904 -> d
+    2067:2075:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1974:1982 -> d
+    2076:2076:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2013:2013 -> d
+    2076:2076:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):1986 -> d
+    2077:2077:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$42(com.android.tools.r8.graph.DexType):2103:2103 -> d
+    2078:2079:void traceFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult,com.android.tools.r8.graph.ProgramMethod):3133:3134 -> d
+    2078:2079:void lambda$traceStaticFieldWrite$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1938 -> d
+    2080:2080:void lambda$traceStaticFieldWrite$40(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.FieldResolutionResult$FailedOrUnknownFieldResolutionResult):1939:1939 -> d
+    2081:2082:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):3177:3178 -> d
+    2083:2083:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):3249:3249 -> d
+    2084:2089:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3632:3637 -> d
+    2090:2090:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> d
+    2090:2090:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3637 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2084:2084:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> d
-    2084:2084:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> d
+    2091:2091:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> d
+    2091:2091:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2084:2084:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3625 -> d
-    2085:2085:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3627:3627 -> d
-    2086:2086:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> d
-    2086:2086:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3627 -> d
-    2087:2087:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3609:3609 -> d
-    2087:2087:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3628 -> d
-    2088:2088:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> d
-    2088:2088:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3610 -> d
+    2091:2091:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3637 -> d
+    2092:2092:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3639:3639 -> d
+    2093:2093:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> d
+    2093:2093:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3639 -> d
+    2094:2094:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3621:3621 -> d
+    2094:2094:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3640 -> d
+    2095:2095:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> d
+    2095:2095:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3622 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2088:2088:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3628 -> d
-    2089:2089:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> d
-    2089:2089:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3610 -> d
-    2089:2089:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3628 -> d
-    2090:2090:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3611:3611 -> d
-    2090:2090:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3628 -> d
-    2091:2092:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):910:911 -> d
-    2091:2092:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612 -> d
-    2091:2092:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3628 -> d
-    2093:2093:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> d
-    2093:2093:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):912 -> d
+    2095:2095:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3640 -> d
+    2096:2096:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> d
+    2096:2096:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3622 -> d
+    2096:2096:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3640 -> d
+    2097:2097:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3623:3623 -> d
+    2097:2097:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3640 -> d
+    2098:2099:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):911:912 -> d
+    2098:2099:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3624 -> d
+    2098:2099:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3640 -> d
+    2100:2100:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> d
+    2100:2100:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):913 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2093:2093:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612 -> d
-    2093:2093:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3628 -> d
-    2094:2094:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):912:912 -> d
-    2094:2094:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3612 -> d
-    2094:2094:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3628 -> d
-    2095:2100:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3670:3675 -> d
-    2101:2101:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> d
-    2101:2101:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3675 -> d
+    2100:2100:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3624 -> d
+    2100:2100:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3640 -> d
+    2101:2101:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):913:913 -> d
+    2101:2101:void enqueueClassIfShrinkingIsDisallowed(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3624 -> d
+    2101:2101:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner):3640 -> d
+    2102:2107:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3682:3687 -> d
+    2108:2108:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> d
+    2108:2108:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3687 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2102:2102:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> d
-    2102:2102:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> d
+    2109:2109:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> d
+    2109:2109:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2102:2102:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3675 -> d
-    2103:2103:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3677:3677 -> d
-    2104:2104:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> d
-    2104:2104:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3677 -> d
-    2105:2105:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3661:3661 -> d
-    2105:2105:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3678 -> d
-    2106:2106:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> d
-    2106:2106:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3662 -> d
+    2109:2109:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3687 -> d
+    2110:2110:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3689:3689 -> d
+    2111:2111:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> d
+    2111:2111:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3689 -> d
+    2112:2112:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3673:3673 -> d
+    2112:2112:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3690 -> d
+    2113:2113:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> d
+    2113:2113:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3674 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2106:2106:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3678 -> d
-    2107:2107:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> d
-    2107:2107:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3662 -> d
-    2107:2107:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3678 -> d
-    2108:2108:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3663:3663 -> d
-    2108:2108:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3678 -> d
-    2109:2111:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):942:944 -> d
-    2109:2111:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> d
-    2109:2111:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3678 -> d
-    2112:2112:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getReasons():523:523 -> d
-    2112:2112:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):948 -> d
+    2113:2113:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3690 -> d
+    2114:2114:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> d
+    2114:2114:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3674 -> d
+    2114:2114:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3690 -> d
+    2115:2115:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3675:3675 -> d
+    2115:2115:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3690 -> d
+    2116:2118:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):943:945 -> d
+    2116:2118:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> d
+    2116:2118:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3690 -> d
+    2119:2119:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getReasons():523:523 -> d
+    2119:2119:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):949 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2112:2112:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> d
-    2112:2112:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3678 -> d
-    2113:2113:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> d
-    2113:2113:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):949 -> d
-    2113:2113:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> d
-    2113:2113:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3678 -> d
-    2114:2114:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):950:950 -> d
-    2114:2114:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> d
-    2114:2114:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3678 -> d
-    2115:2115:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):946:946 -> d
-    2115:2115:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> d
-    2115:2115:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3678 -> d
-    2116:2116:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):944:944 -> d
-    2116:2116:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3664 -> d
-    2116:2116:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3678 -> d
-    2117:2122:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3730:3735 -> d
-    2123:2123:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> d
-    2123:2123:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3735 -> d
+    2119:2119:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> d
+    2119:2119:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3690 -> d
+    2120:2120:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> d
+    2120:2120:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):950 -> d
+    2120:2120:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> d
+    2120:2120:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3690 -> d
+    2121:2121:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):951:951 -> d
+    2121:2121:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> d
+    2121:2121:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3690 -> d
+    2122:2122:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):947:947 -> d
+    2122:2122:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> d
+    2122:2122:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3690 -> d
+    2123:2123:void enqueueFieldDueToNoShrinkingRule(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):945:945 -> d
+    2123:2123:void enqueueFieldIfShrinkingIsDisallowed(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3676 -> d
+    2123:2123:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):3690 -> d
+    2124:2129:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3742:3747 -> d
+    2130:2130:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119:119 -> d
+    2130:2130:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3747 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2124:2124:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> d
-    2124:2124:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> d
+    2131:2131:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.mergeUnsafe(com.android.tools.r8.shaking.KeepInfo$Joiner):624:624 -> d
+    2131:2131:void com.android.tools.r8.shaking.MinimumKeepInfoCollection.mergeMinimumKeepInfoFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):119 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2124:2124:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3735 -> d
-    2125:2125:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3738:3738 -> d
-    2126:2126:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> d
-    2126:2126:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3738 -> d
-    2127:2127:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3739:3739 -> d
-    2128:2141:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4510:4523 -> d
-    2142:2143:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> d
-    2142:2143:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4523 -> d
-    2144:2147:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4526:4529 -> d
+    2131:2131:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3747 -> d
+    2132:2132:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3750:3750 -> d
+    2133:2133:boolean com.android.tools.r8.shaking.EnqueuerEvent.isUnconditionalKeepInfoEvent():0:0 -> d
+    2133:2133:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3750 -> d
+    2134:2134:void recordDependentMinimumKeepInfo(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3751:3751 -> d
+    2135:2148:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4541:4554 -> d
+    2149:2150:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> d
+    2149:2150:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4554 -> d
+    2151:2154:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4557:4560 -> d
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> e
-    1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1407 -> e
+    1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1414 -> 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):50:50 -> e
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> e
-    2:2:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1407 -> e
-    3:3:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1407:1407 -> e
-    4:4:com.android.tools.r8.shaking.GraphReporter access$300(com.android.tools.r8.shaking.Enqueuer):200:200 -> e
-    5:5:boolean addTargetedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):601:601 -> e
-    5:5:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4637 -> e
-    6:13:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4642:4649 -> e
-    14:15:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4759:4760 -> e
-    14:15:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4650 -> e
+    2:2:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1414 -> e
+    3:3:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1414:1414 -> e
+    4:4:com.android.tools.r8.shaking.GraphReporter access$300(com.android.tools.r8.shaking.Enqueuer):201:201 -> e
+    5:5:boolean addTargetedMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):602:602 -> e
+    5:5:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4672 -> e
+    6:13:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4677:4684 -> e
+    14:15:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4794:4795 -> e
+    14:15:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4685 -> e
     16:16:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):199:199 -> e
-    16:16:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4760 -> e
-    16:16:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4650 -> e
-    17:17:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4759:4759 -> e
-    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4650 -> e
-    18:18:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4653:4653 -> e
-    19:19:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):615:615 -> e
-    20:29:void enqueueAllIfNotShrinking():884:893 -> e
+    16:16:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4795 -> e
+    16:16:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4685 -> e
+    17:17:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):4794:4794 -> e
+    17:17:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4685 -> e
+    18:18:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4688:4688 -> e
+    19:19:void recordTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):616:616 -> e
+    20:29:void enqueueAllIfNotShrinking():885:894 -> e
     30:30:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404:404 -> e
-    30:30:void enqueueAllIfNotShrinking():893 -> e
+    30:30:void enqueueAllIfNotShrinking():894 -> e
     31:31:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):400:400 -> e
     31:31:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404 -> e
-    31:31:void enqueueAllIfNotShrinking():893 -> e
-    32:33:void enqueueAllIfNotShrinking():893:894 -> e
-    34:35:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):910:911 -> e
-    34:35:void enqueueAllIfNotShrinking():898 -> e
+    31:31:void enqueueAllIfNotShrinking():894 -> e
+    32:33:void enqueueAllIfNotShrinking():894:895 -> e
+    34:35:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):911:912 -> e
+    34:35:void enqueueAllIfNotShrinking():899 -> e
     36:36:java.util.Set com.android.tools.r8.shaking.KeepInfo$Joiner.getRules():527:527 -> e
-    36:36:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):912 -> e
+    36:36:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):913 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:36:void enqueueAllIfNotShrinking():898 -> e
-    37:37:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):912:912 -> e
-    37:37:void enqueueAllIfNotShrinking():898 -> e
-    38:38:void enqueueAllIfNotShrinking():899:899 -> e
-    39:39:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> e
-    39:39:void enqueueAllIfNotShrinking():899 -> e
-    40:40:void enqueueAllIfNotShrinking():901:901 -> e
-    41:41:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1352:1352 -> e
-    42:42:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1348:1348 -> e
-    42:42:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1353 -> e
-    43:43:void lambda$traceInvokeVirtual$24(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1509:1509 -> e
-    44:44:java.util.Map lambda$processAnnotation$52(com.android.tools.r8.graph.DexType):2269:2269 -> e
-    45:45:void lambda$markDirectStaticOrConstructorMethodAsLive$79(com.android.tools.r8.graph.ProgramMethod):3130:3130 -> e
-    46:48:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1955:1957 -> e
-    46:48:void lambda$markDirectStaticOrConstructorMethodAsLive$79(com.android.tools.r8.graph.ProgramMethod):3130 -> e
-    49:49:void lambda$markDirectStaticOrConstructorMethodAsLive$79(com.android.tools.r8.graph.ProgramMethod):3131:3131 -> e
-    50:50:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1962:1962 -> e
-    50:50:void lambda$markDirectStaticOrConstructorMethodAsLive$79(com.android.tools.r8.graph.ProgramMethod):3131 -> e
-    51:55:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3176:3180 -> e
-    56:56:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():818:818 -> e
-    56:56:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3180 -> e
-    57:58:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3182:3183 -> e
-    59:62:java.util.Set lambda$createEnqueuerResult$115(com.android.tools.r8.graph.DexProgramClass):4087:4090 -> e
+    36:36:void enqueueAllIfNotShrinking():899 -> e
+    37:37:void enqueueClassDueToNoShrinkingRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepClassInfo$Joiner,com.android.tools.r8.shaking.EnqueuerEvent):913:913 -> e
+    37:37:void enqueueAllIfNotShrinking():899 -> e
+    38:38:void enqueueAllIfNotShrinking():900:900 -> e
+    39:39:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> e
+    39:39:void enqueueAllIfNotShrinking():900 -> e
+    40:40:void enqueueAllIfNotShrinking():902:902 -> e
+    41:41:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1359:1359 -> e
+    42:42:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1355:1355 -> e
+    42:42:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1360 -> e
+    43:43:void lambda$traceInvokeVirtual$24(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1516:1516 -> e
+    44:44:java.util.Map lambda$processAnnotation$52(com.android.tools.r8.graph.DexType):2281:2281 -> e
+    45:45:void lambda$markDirectStaticOrConstructorMethodAsLive$79(com.android.tools.r8.graph.ProgramMethod):3142:3142 -> e
+    46:48:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1962:1964 -> e
+    46:48:void lambda$markDirectStaticOrConstructorMethodAsLive$79(com.android.tools.r8.graph.ProgramMethod):3142 -> e
+    49:49:void lambda$markDirectStaticOrConstructorMethodAsLive$79(com.android.tools.r8.graph.ProgramMethod):3143:3143 -> e
+    50:50:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1969:1969 -> e
+    50:50:void lambda$markDirectStaticOrConstructorMethodAsLive$79(com.android.tools.r8.graph.ProgramMethod):3143 -> e
+    51:55:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3188:3192 -> e
+    56:56:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():832:832 -> e
+    56:56:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3192 -> e
+    57:58:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):3194:3195 -> e
+    59:62:java.util.Set lambda$createEnqueuerResult$116(com.android.tools.r8.graph.DexProgramClass):4120:4123 -> e
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> f
-    1:1:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1428 -> f
+    1:1:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1435 -> 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):50:50 -> f
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> f
-    2:2:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1428 -> f
-    3:3:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1428:1428 -> f
-    4:4:com.android.tools.r8.shaking.EnqueuerWorklist access$400(com.android.tools.r8.shaking.Enqueuer):200:200 -> f
-    5:5:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):605:605 -> f
-    6:6:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2628:2628 -> f
-    6:6:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):607 -> f
-    7:9:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):608:610 -> f
-    10:14:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):747:751 -> f
-    10:14:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):609 -> f
-    15:15:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl getFieldAccessInfoCollection():709:709 -> f
-    16:24:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1513:1521 -> f
+    2:2:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1435 -> f
+    3:3:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1435:1435 -> f
+    4:4:com.android.tools.r8.shaking.EnqueuerWorklist access$400(com.android.tools.r8.shaking.Enqueuer):201:201 -> f
+    5:5:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):606:606 -> f
+    6:6:void ignoreMissingClass(com.android.tools.r8.graph.DexType):2640:2640 -> f
+    6:6:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):608 -> f
+    7:9:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):609:611 -> f
+    10:14:void addLiveNonProgramType(com.android.tools.r8.graph.ClasspathOrLibraryClass,boolean,java.util.function.BiConsumer):748:752 -> f
+    10:14:void recordCompilerSynthesizedTypeReference(com.android.tools.r8.graph.DexType):610 -> f
+    15:15:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl getFieldAccessInfoCollection():710:710 -> f
+    16:24:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1520:1528 -> f
     25:25:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):34:34 -> f
-    25:25:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1525 -> f
-    26:26: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):1538:1538 -> f
-    26:26:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1521 -> f
-    27:27:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> f
-    27:27: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):1540 -> f
-    27:27:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1521 -> f
-    28:31: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):1540:1543 -> f
-    28:31:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1521 -> f
-    32:32: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):1541:1541 -> f
-    32:32:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1521 -> f
-    33:33:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$77(com.android.tools.r8.graph.DexProgramClass):3099:3099 -> f
-    34:34:void lambda$markDirectStaticOrConstructorMethodAsLive$80(com.android.tools.r8.graph.ProgramMethod):3135:3135 -> f
-    35:35:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1962:1962 -> f
-    35:35:void lambda$markDirectStaticOrConstructorMethodAsLive$80(com.android.tools.r8.graph.ProgramMethod):3135 -> f
-    36:37:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3141:3142 -> f
+    25:25:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1532 -> f
+    26:26: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):1545:1545 -> f
+    26:26:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1528 -> f
+    27:27:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> f
+    27:27: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):1547 -> f
+    27:27:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1528 -> f
+    28:31: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):1547:1550 -> f
+    28:31:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1528 -> f
+    32:32: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):1548:1548 -> f
+    32:32:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1528 -> f
+    33:33:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markFieldAsReachable$77(com.android.tools.r8.graph.DexProgramClass):3111:3111 -> f
+    34:34:void lambda$markDirectStaticOrConstructorMethodAsLive$80(com.android.tools.r8.graph.ProgramMethod):3147:3147 -> f
+    35:35:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1969:1969 -> f
+    35:35:void lambda$markDirectStaticOrConstructorMethodAsLive$80(com.android.tools.r8.graph.ProgramMethod):3147 -> f
+    36:37:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3153:3154 -> f
     38:38:boolean com.android.tools.r8.shaking.KeepReason.isDueToReflectiveUse():0:0 -> f
-    38:38:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3143 -> f
-    39:42:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3141:3144 -> f
-    1:1:com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet access$500(com.android.tools.r8.shaking.Enqueuer):200:200 -> g
-    2:2:com.android.tools.r8.shaking.GraphReporter getGraphReporter():526:526 -> g
-    3:4:void traceSafeCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1175:1176 -> g
-    5:15:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1937:1947 -> g
-    5:15:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1470 -> g
-    16:18:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1471:1471 -> g
-    22:23:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1475:1476 -> g
+    38:38:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3155 -> f
+    39:42:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3153:3156 -> f
+    1:1:com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet access$500(com.android.tools.r8.shaking.Enqueuer):201:201 -> g
+    2:2:com.android.tools.r8.shaking.GraphReporter getGraphReporter():527:527 -> g
+    3:4:void traceSafeCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1182:1183 -> g
+    5:15:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1944:1954 -> g
+    5:15:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1477 -> g
+    16:18:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1478:1478 -> g
+    22:23:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1482:1483 -> g
     24:24:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> g
-    24:24:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1476 -> g
-    25:26:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1478:1479 -> g
-    27:27:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$51(com.android.tools.r8.graph.DexProgramClass):2215:2215 -> g
-    28:32:void traceCode(com.android.tools.r8.graph.ProgramMethod):4684:4688 -> g
+    24:24:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1483 -> g
+    25:26:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1485:1486 -> g
+    27:27:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$51(com.android.tools.r8.graph.DexProgramClass):2227:2227 -> g
+    28:32:void traceCode(com.android.tools.r8.graph.ProgramMethod):4719:4723 -> g
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54:54 -> h
-    1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1483 -> h
+    1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1490 -> 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):50:50 -> h
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):54 -> h
-    2:2:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1483 -> h
-    3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1483:1483 -> h
-    4:4:java.util.Set access$700(com.android.tools.r8.shaking.Enqueuer):200:200 -> h
-    5:5:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():713:713 -> h
-    6:6:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1348:1348 -> h
-    7:18:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2381:2392 -> h
-    19:25:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):2413:2419 -> h
-    19:25:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2396 -> h
-    26:29:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2402:2405 -> h
-    30:30:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4692:4692 -> h
-    30:30:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4657 -> h
-    31:31:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2006:2006 -> h
-    31:31:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4692 -> h
-    31:31:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4657 -> h
-    32:35:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4697:4700 -> h
-    32:35:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4693 -> h
-    32:35:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4657 -> h
-    36:36:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2241:2241 -> h
-    36:36:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4658 -> h
+    2:2:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1490 -> h
+    3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1490:1490 -> h
+    4:4:java.util.Set access$700(com.android.tools.r8.shaking.Enqueuer):201:201 -> h
+    5:5:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():714:714 -> h
+    6:6:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1355:1355 -> h
+    7:18:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2393:2404 -> h
+    19:25:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):2425:2431 -> h
+    19:25:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2408 -> h
+    26:29:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):2414:2417 -> h
+    30:30:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4727:4727 -> h
+    30:30:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4692 -> h
+    31:31:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):2013:2013 -> h
+    31:31:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4727 -> h
+    31:31:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4692 -> h
+    32:35:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4732:4735 -> h
+    32:35:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):4728 -> h
+    32:35:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4692 -> h
+    36:36:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2253:2253 -> h
+    36:36:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4693 -> h
     37:37:com.android.tools.r8.graph.DexAnnotation$AnnotatedKind com.android.tools.r8.graph.DexAnnotation$AnnotatedKind.from(com.android.tools.r8.graph.ProgramDefinition):40:40 -> h
-    37:37:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2242 -> h
-    37:37:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4658 -> h
-    38:38:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2247:2247 -> h
-    38:38:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2239 -> h
-    38:38:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4658 -> h
-    39:40:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2252:2253 -> h
-    39:40:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2247 -> h
-    39:40:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2239 -> h
-    39:40:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4658 -> h
-    41:49:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4660:4668 -> h
-    50:50:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():713:713 -> h
-    50:50:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4669 -> h
-    51:51:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4669:4669 -> h
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy access$800(com.android.tools.r8.shaking.Enqueuer):200:200 -> i
-    2:2:com.android.tools.r8.shaking.Enqueuer$Mode getMode():522:522 -> i
-    3:4:void traceRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.ProgramMethod):1259:1260 -> i
-    5:20:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):2429:2444 -> i
-    1:1:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder access$900(com.android.tools.r8.shaking.Enqueuer):200:200 -> j
-    2:2:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl getObjectAllocationInfoCollection():735:735 -> j
-    3:20:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):2454:2471 -> j
-    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():538:538 -> k
-    2:35:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):3000:3033 -> k
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist getWorklist():739:739 -> l
-    1:7:void postProcessingDesugaring():4377:4383 -> m
+    37:37:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2254 -> h
+    37:37:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4693 -> h
+    38:38:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2259:2259 -> h
+    38:38:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2251 -> h
+    38:38:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4693 -> h
+    39:40:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation[],com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2264:2265 -> h
+    39:40:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):2259 -> h
+    39:40:void processAnnotations(com.android.tools.r8.graph.ProgramDefinition):2251 -> h
+    39:40:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4693 -> h
+    41:49:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4695:4703 -> h
+    50:50:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection getKeepInfo():714:714 -> h
+    50:50:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4704 -> h
+    51:51:void traceMethodDefinitionExcludingCode(com.android.tools.r8.graph.ProgramMethod):4704:4704 -> h
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy access$800(com.android.tools.r8.shaking.Enqueuer):201:201 -> i
+    2:2:com.android.tools.r8.shaking.Enqueuer$Mode getMode():523:523 -> i
+    3:4:void traceRecordFieldValues(com.android.tools.r8.graph.DexField[],com.android.tools.r8.graph.ProgramMethod):1266:1267 -> i
+    5:20:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):2441:2456 -> i
+    1:1:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder access$900(com.android.tools.r8.shaking.Enqueuer):201:201 -> j
+    2:2:com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl getObjectAllocationInfoCollection():736:736 -> j
+    3:20:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):2466:2483 -> j
+    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():539:539 -> k
+    2:35:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):3012:3045 -> k
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist getWorklist():740:740 -> l
+    1:7:void postProcessingDesugaring():4408:4414 -> m
     8:8:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> m
-    8:8:void postProcessingDesugaring():4383 -> m
+    8:8:void postProcessingDesugaring():4414 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> m
-    9:9:void postProcessingDesugaring():4383 -> m
-    10:28:void postProcessingDesugaring():4383:4401 -> m
-    29:33:void postProcessingDesugaring():4400:4404 -> m
-    34:50:void postProcessingDesugaring():4403:4419 -> m
+    9:9:void postProcessingDesugaring():4414 -> m
+    10:28:void postProcessingDesugaring():4414:4432 -> m
+    29:33:void postProcessingDesugaring():4431:4435 -> m
+    34:50:void postProcessingDesugaring():4434:4450 -> m
     51:51:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> m
-    51:51:void postProcessingDesugaring():4419 -> m
+    51:51:void postProcessingDesugaring():4450 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     52:52:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> m
-    52:52:void postProcessingDesugaring():4419 -> m
-    53:53:void postProcessingDesugaring():4420:4420 -> m
+    52:52:void postProcessingDesugaring():4450 -> m
+    53:53:void postProcessingDesugaring():4451:4451 -> m
     54:54:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():536:536 -> m
-    54:54:void postProcessingDesugaring():4420 -> m
+    54:54:void postProcessingDesugaring():4451 -> m
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     55:55:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.EnqueuerWorklist.poll():536:536 -> m
-    55:55:void postProcessingDesugaring():4420 -> m
-    56:56:void postProcessingDesugaring():4421:4421 -> m
-    1:8:void synthesize():3858:3865 -> n
-    9:14:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3997:4002 -> n
-    9:14:void synthesize():3866 -> n
-    15:26:void synthesize():3867:3878 -> n
-com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.shaking.p:
+    55:55:void postProcessingDesugaring():4451 -> m
+    56:56:void postProcessingDesugaring():4452:4452 -> m
+    1:8:void synthesize():3870:3877 -> n
+    9:14:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):4030:4035 -> n
+    9:14:void synthesize():3878 -> n
+    15:26:void synthesize():3879:3890 -> n
+com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.shaking.t:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
     com.android.tools.r8.graph.ProgramDefinition context -> a
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$1):5273:5273 -> <init>
-    2:4:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):5278:5280 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.Enqueuer$1):5308:5308 -> <init>
+    2:4:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):5313:5315 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addClass(com.android.tools.r8.graph.DexProgramClass) -> 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:24:boolean addField(com.android.tools.r8.graph.DexField):5290:5313 -> a
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    25:25:boolean addField(com.android.tools.r8.graph.DexField):5313 -> a
+    1:24:boolean addField(com.android.tools.r8.graph.DexField):5325:5348 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    25:25:boolean addField(com.android.tools.r8.graph.DexField):5348 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    26:26:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    26:26:boolean addField(com.android.tools.r8.graph.DexField):5313 -> a
-    27:32:boolean addField(com.android.tools.r8.graph.DexField):5313:5318 -> a
-    33:48:boolean addMethod(com.android.tools.r8.graph.DexMethod):5326:5341 -> a
-    49:49:boolean addType(com.android.tools.r8.graph.DexType):5369:5369 -> a
-com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.q:
+    26:26:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    26:26:boolean addField(com.android.tools.r8.graph.DexField):5348 -> a
+    27:32:boolean addField(com.android.tools.r8.graph.DexField):5348:5353 -> a
+    33:48:boolean addMethod(com.android.tools.r8.graph.DexMethod):5361:5376 -> a
+    49:49:boolean addType(com.android.tools.r8.graph.DexType):5404:5404 -> a
+com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.u:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
-    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):5378:5379 -> <init>
-    1:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):5383:5383 -> a
-    4:4:void lambda$definitionFor$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):5384:5384 -> a
-    5:5:void lambda$definitionFor$1(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):5384:5384 -> a
-com.android.tools.r8.shaking.Enqueuer$FieldAccessKind -> com.android.tools.r8.shaking.r:
+    1:2:void <init>(com.android.tools.r8.shaking.Enqueuer):5413:5414 -> <init>
+    1:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDefinition):5418:5418 -> a
+    4:4:void lambda$definitionFor$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDerivedContext):5419:5419 -> a
+    5:5:void lambda$definitionFor$1(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramDerivedContext):5419:5419 -> a
+com.android.tools.r8.shaking.Enqueuer$FieldAccessKind -> com.android.tools.r8.shaking.v:
     com.android.tools.r8.shaking.Enqueuer$FieldAccessKind INSTANCE_WRITE -> c
     com.android.tools.r8.shaking.Enqueuer$FieldAccessKind STATIC_READ -> d
     com.android.tools.r8.shaking.Enqueuer$FieldAccessKind INSTANCE_READ -> b
     com.android.tools.r8.shaking.Enqueuer$FieldAccessKind STATIC_WRITE -> e
-    1:4:void <clinit>():1561:1564 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1560:1560 -> <init>
-com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata -> com.android.tools.r8.shaking.s:
+    1:4:void <clinit>():1568:1571 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1567:1567 -> <init>
+com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata -> com.android.tools.r8.shaking.w:
     com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata DEFAULT -> c
     com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata deferred -> a
     int flags -> b
     com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata FROM_RECORD_METHOD_HANDLE -> e
     com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata FROM_METHOD_HANDLE -> d
-    1:4:void <clinit>():1601:1604 -> <clinit>
-    1:3:void <init>(int):1610:1612 -> <init>
-    1:1:boolean isDeferred():1616:1616 -> a
-    1:1:boolean isFromMethodHandle():1620:1620 -> b
-    1:1:boolean isFromRecordMethodHandle():1624:1624 -> c
-    1:1:com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata toDeferred():1628:1628 -> d
-    1:5:boolean equals(java.lang.Object):1636:1640 -> equals
-    1:1:int hashCode():1645:1645 -> hashCode
-com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet -> com.android.tools.r8.shaking.t:
+    1:4:void <clinit>():1608:1611 -> <clinit>
+    1:3:void <init>(int):1617:1619 -> <init>
+    1:1:boolean isDeferred():1623:1623 -> a
+    1:1:boolean isFromMethodHandle():1627:1627 -> b
+    1:1:boolean isFromRecordMethodHandle():1631:1631 -> c
+    1:1:com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata toDeferred():1635:1635 -> d
+    1:5:boolean equals(java.lang.Object):1643:1647 -> equals
+    1:1:int hashCode():1652:1652 -> hashCode
+com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet -> com.android.tools.r8.shaking.x:
     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):5223:5223 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):5219:5224 -> <init>
-    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):5217:5217 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):5228:5231 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):5235:5235 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):5239:5239 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):5235:5235 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):5239 -> a
-com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.u:
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):5258:5258 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):5254:5259 -> <init>
+    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):5252:5252 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):5263:5266 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):5270:5270 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):5274:5274 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):5270:5270 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):5274 -> a
+com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.y:
     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):5249:5249 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):5245:5250 -> <init>
-    1:1:java.util.Set access$1200(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):5243:5243 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5254:5257 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):5261:5261 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):5265:5265 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):5261:5261 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):5265 -> a
-    9:9:java.util.Set getItems():5269:5269 -> a
-com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.v$a:
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):5284:5284 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):5280:5285 -> <init>
+    1:1:java.util.Set access$1200(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):5278:5278 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):5289:5292 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):5296:5296 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):5300:5300 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):5296:5296 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):5300 -> a
+    9:9:java.util.Set getItems():5304:5304 -> a
+com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.z$a:
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_MAIN_DEX_TRACING -> e
     com.android.tools.r8.shaking.Enqueuer$Mode INITIAL_MAIN_DEX_TRACING -> d
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_TREE_SHAKING -> c
     com.android.tools.r8.shaking.Enqueuer$Mode INITIAL_TREE_SHAKING -> b
     com.android.tools.r8.shaking.Enqueuer$Mode WHY_ARE_YOU_KEEPING -> g
     com.android.tools.r8.shaking.Enqueuer$Mode GENERATE_MAIN_DEX_LIST -> f
-    1:6:void <clinit>():203:208 -> <clinit>
-    1:1:void <init>(java.lang.String,int):202:202 -> <init>
-    1:1:boolean isFinalTreeShaking():219:219 -> a
-    1:1:boolean isInitialTreeShaking():215:215 -> b
-    1:1:boolean isInitialMainDexTracing():223:223 -> c
-    1:1:boolean isMainDexTracing():235 -> c
-    2:2:boolean isFinalMainDexTracing():227:227 -> c
-    2:2:boolean isMainDexTracing():235 -> c
-    3:3:boolean isGenerateMainDexList():231:231 -> c
-    3:3:boolean isMainDexTracing():235 -> c
-    1:1:boolean isTreeShaking():211:211 -> d
-com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey -> com.android.tools.r8.shaking.w:
+    1:6:void <clinit>():204:209 -> <clinit>
+    1:1:void <init>(java.lang.String,int):203:203 -> <init>
+    1:1:boolean isFinalTreeShaking():220:220 -> a
+    1:1:boolean isInitialTreeShaking():216:216 -> b
+    1:1:boolean isInitialMainDexTracing():224:224 -> c
+    1:1:boolean isMainDexTracing():236 -> c
+    2:2:boolean isFinalMainDexTracing():228:228 -> c
+    2:2:boolean isMainDexTracing():236 -> c
+    3:3:boolean isGenerateMainDexList():232:232 -> c
+    3:3:boolean isMainDexTracing():236 -> c
+    1:1:boolean isTreeShaking():212:212 -> d
+com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey -> com.android.tools.r8.shaking.A:
     boolean isInterface -> b
     com.android.tools.r8.graph.DexMethod method -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.Enqueuer$1):5388:5388 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexMethod,boolean):5393:5395 -> <init>
-    1:1:com.android.tools.r8.graph.DexMethod access$2800(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):5388:5388 -> a
-    1:1:boolean access$2900(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):5388:5388 -> b
-    1:5:boolean equals(java.lang.Object):5400:5404 -> equals
-    1:1:int hashCode():5409:5409 -> hashCode
-com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.x:
+    1:1:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.shaking.Enqueuer$1):5423:5423 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexMethod,boolean):5428:5430 -> <init>
+    1:1:com.android.tools.r8.graph.DexMethod access$2800(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):5423:5423 -> a
+    1:1:boolean access$2900(com.android.tools.r8.shaking.Enqueuer$ResolutionSearchKey):5423:5423 -> b
+    1:5:boolean equals(java.lang.Object):5435:5439 -> equals
+    1:1:int hashCode():5444:5444 -> hashCode
+com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.B:
     java.util.Map deferredActions -> b
     java.util.Set items -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():5186:5186 -> <clinit>
-    1:4:void <init>():5186:5189 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):5186:5186 -> <init>
-    1:1:java.util.Set access$1100(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):5186:5186 -> a
-    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):5192:5194 -> a
-    5:5:boolean contains(java.lang.Object):5201:5201 -> a
-    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):5205:5206 -> a
-    8:8:java.util.Set getItems():5213:5213 -> a
-    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):5206:5206 -> b
-com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.y:
+    1:1:void <clinit>():5221:5221 -> <clinit>
+    1:4:void <init>():5221:5224 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):5221:5221 -> <init>
+    1:1:java.util.Set access$1100(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):5221:5221 -> a
+    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):5227:5229 -> a
+    5:5:boolean contains(java.lang.Object):5236:5236 -> a
+    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):5240:5241 -> a
+    8:8:java.util.Set getItems():5248:5248 -> a
+    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):5241:5241 -> b
+com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.C:
     java.util.Map methodProcessingContexts -> b
     java.util.Map liveMethods -> d
     boolean $assertionsDisabled -> i
@@ -115760,26 +116534,26 @@
     java.util.Map syntheticClasspathClasses -> f
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext processorContext -> a
     java.util.Map injectedInterfaces -> g
-    1:1:void <clinit>():3759:3759 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3782:3782 -> <init>
-    2:23:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3762:3783 -> <init>
-    1:1:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$getMethodContext$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):3788:3788 -> a
-    2:7:boolean isEmpty():3792:3797 -> a
-    8:9:void addLiveClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3802:3803 -> a
-    10:12:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3807:3809 -> a
-    13:15:void injectInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):3817:3819 -> a
-    16:16:java.util.Set lambda$injectInterface$1(com.android.tools.r8.graph.DexProgramClass):3818:3818 -> a
-    17:19:void addMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3823:3823 -> a
-    20:23:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3828:3831 -> a
+    1:1:void <clinit>():3771:3771 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3794:3794 -> <init>
+    2:23:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext):3774:3795 -> <init>
+    1:1:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$getMethodContext$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):3800:3800 -> a
+    2:7:boolean isEmpty():3804:3809 -> a
+    8:9:void addLiveClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3814:3815 -> a
+    10:12:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3819:3821 -> a
+    13:15:void injectInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass):3829:3831 -> a
+    16:16:java.util.Set lambda$injectInterface$1(com.android.tools.r8.graph.DexProgramClass):3830:3830 -> a
+    17:19:void addMinimumKeepInfo(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3835:3835 -> a
+    20:23:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3840:3843 -> a
     24:24:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():75:75 -> a
-    24:24:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3831 -> a
-    25:43:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3833:3851 -> a
-    44:44:void lambda$enqueueWorkItems$2(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3838:3838 -> a
-    45:47:void lambda$enqueueWorkItems$3(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):3847:3847 -> a
-    48:48:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3853:3853 -> a
-    1:1:void addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):3813:3813 -> b
-    1:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):3787:3787 -> c
-com.android.tools.r8.shaking.EnqueuerDeferredTracing -> com.android.tools.r8.shaking.z:
+    24:24:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3843 -> a
+    25:43:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3845:3863 -> a
+    44:44:void lambda$enqueueWorkItems$2(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3850:3850 -> a
+    45:47:void lambda$enqueueWorkItems$3(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,java.util.Set):3859:3859 -> a
+    48:48:void lambda$enqueueWorkItems$4(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):3865:3865 -> a
+    1:1:void addMethodWithDesugaredCodeForTracing(com.android.tools.r8.graph.ProgramMethod):3825:3825 -> b
+    1:3:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext getMethodContext(com.android.tools.r8.graph.ProgramMethod):3799:3799 -> c
+com.android.tools.r8.shaking.EnqueuerDeferredTracing -> com.android.tools.r8.shaking.D:
     1:1:void <init>():20:20 -> <init>
     boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata) -> a
     boolean enqueueWorklistActions(com.android.tools.r8.shaking.EnqueuerWorklist) -> a
@@ -115791,7 +116565,7 @@
     3:9:com.android.tools.r8.shaking.EnqueuerDeferredTracing create(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$Mode):27:33 -> a
     10:10:com.android.tools.r8.shaking.EmptyEnqueuerDeferredTracing empty():37:37 -> a
     10:10:com.android.tools.r8.shaking.EnqueuerDeferredTracing create(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$Mode):31 -> a
-com.android.tools.r8.shaking.EnqueuerDeferredTracingImpl -> com.android.tools.r8.shaking.A:
+com.android.tools.r8.shaking.EnqueuerDeferredTracingImpl -> com.android.tools.r8.shaking.E:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> b
     com.android.tools.r8.shaking.Enqueuer$Mode mode -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -115800,81 +116574,84 @@
     com.android.tools.r8.utils.collections.ProgramFieldSet ineligibleForPruning -> g
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.collections.ProgramFieldMap deferredEnqueuerActions -> f
-    1:1:void <clinit>():48:48 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$Mode):68:68 -> <init>
-    2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$Mode):62:73 -> <init>
-    1:7:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):83:89 -> a
-    8:8:boolean com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.isStatic():1571:1571 -> a
-    8:8:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):89 -> a
-    9:14:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):90:95 -> a
-    15:15:boolean com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.isRead():1567:1567 -> a
-    15:15:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):98 -> a
-    16:32:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):102:118 -> a
-    33:43:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1580:1590 -> a
-    33:43:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):118 -> a
-    44:44:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1588:1588 -> a
-    44:44:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):118 -> a
-    45:45:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1586:1586 -> a
-    45:45:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):118 -> a
-    46:46:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1584:1584 -> a
-    46:46:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):118 -> a
-    47:47:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1582:1582 -> a
-    47:47:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):118 -> a
-    48:50:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):119:121 -> a
-    51:51:boolean com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.isStatic():1571:1571 -> a
-    51:51:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):126 -> a
-    52:55:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):127:130 -> a
-    56:56:void notifyReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):138:138 -> a
-    57:57:boolean enqueueWorklistActions(com.android.tools.r8.shaking.EnqueuerWorklist):211:211 -> a
-    58:61:boolean lambda$enqueueWorklistActions$1(com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.ProgramField,java.util.Set):213:216 -> a
-    62:87:void rewriteApplication(java.util.concurrent.ExecutorService):223:248 -> a
-    88:88:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    88:88:void rewriteApplication(java.util.concurrent.ExecutorService):248 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    1:1:void <clinit>():47:47 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$Mode):67:67 -> <init>
+    2:13:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$Mode):61:72 -> <init>
+    1:7:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):82:88 -> a
+    8:8:boolean com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.isStatic():1578:1578 -> a
+    8:8:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):88 -> a
+    9:14:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):89:94 -> a
+    15:15:boolean com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.isRead():1574:1574 -> a
+    15:15:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):97 -> a
+    16:16:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):101:101 -> a
+    17:17:com.android.tools.r8.ir.optimize.membervaluepropagation.assume.AssumeInfo com.android.tools.r8.shaking.AssumeInfoCollection.get(com.android.tools.r8.graph.DexClassAndMember):45:45 -> a
+    17:17:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):101 -> a
+    18:33:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):102:117 -> a
+    34:44:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1587:1597 -> a
+    34:44:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):117 -> a
+    45:45:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1595:1595 -> a
+    45:45:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):117 -> a
+    46:46:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1593:1593 -> a
+    46:46:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):117 -> a
+    47:47:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1591:1591 -> a
+    47:47:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):117 -> a
+    48:48:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.toEnqueuerAction(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):1589:1589 -> a
+    48:48:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):117 -> a
+    49:51:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):118:120 -> a
+    52:52:boolean com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.isStatic():1578:1578 -> a
+    52:52:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):125 -> a
+    53:56:boolean deferTracingOfFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):126:129 -> a
+    57:57:void notifyReflectiveFieldAccess(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):137:137 -> a
+    58:58:boolean enqueueWorklistActions(com.android.tools.r8.shaking.EnqueuerWorklist):210:210 -> a
+    59:62:boolean lambda$enqueueWorklistActions$1(com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.ProgramField,java.util.Set):212:215 -> a
+    63:88:void rewriteApplication(java.util.concurrent.ExecutorService):222:247 -> a
     89:89:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
-    89:89:void rewriteApplication(java.util.concurrent.ExecutorService):248 -> a
-    90:93:void rewriteApplication(java.util.concurrent.ExecutorService):248:251 -> a
-    94:97:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):229:232 -> a
-    98:98:void lambda$rewriteApplication$2(java.util.Map,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.DexField):232:232 -> a
-    99:99:void lambda$rewriteApplication$5(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):247:247 -> a
-    100:100:void lambda$rewriteApplication$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):247:247 -> a
-    101:101:void lambda$rewriteApplication$7(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.ProgramField):251:251 -> a
-    102:107:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):260:265 -> a
-    102:107:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod):241 -> a
-    108:108:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):36:36 -> a
-    108:108:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):265 -> a
-    108:108:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod):241 -> a
+    89:89:void rewriteApplication(java.util.concurrent.ExecutorService):247 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    90:90:boolean com.android.tools.r8.shaking.EnqueuerWorklist.isEmpty():532:532 -> a
+    90:90:void rewriteApplication(java.util.concurrent.ExecutorService):247 -> a
+    91:94:void rewriteApplication(java.util.concurrent.ExecutorService):247:250 -> a
+    95:98:void lambda$rewriteApplication$3(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,java.util.Map,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramField,java.util.Set):228:231 -> a
+    99:99:void lambda$rewriteApplication$2(java.util.Map,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.DexField):231:231 -> a
+    100:100:void lambda$rewriteApplication$5(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):246:246 -> a
+    101:101:void lambda$rewriteApplication$6(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):246:246 -> a
+    102:102:void lambda$rewriteApplication$7(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.ProgramField):250:250 -> a
+    103:108:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):259:264 -> a
+    103:108:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod):240 -> a
+    109:109:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):36:36 -> a
+    109:109:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):264 -> a
+    109:109:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod):240 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    109:111:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):36:38 -> a
-    109:111:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):265 -> a
-    109:111:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod):241 -> a
-    112:124:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):268:280 -> a
-    112:124:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod):241 -> a
-    125:125:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isOptimizationAllowed():539:539 -> a
-    125:125:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):157 -> a
-      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    110:112:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions):36:38 -> a
+    110:112:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):264 -> a
+    110:112:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod):240 -> a
+    113:125:void rewriteMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Map,java.util.Map):267:279 -> a
+    113:125:void lambda$rewriteApplication$4(java.util.Map,java.util.Map,com.android.tools.r8.graph.ProgramMethod):240 -> a
     126:126:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isOptimizationAllowed():539:539 -> a
-    126:126:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):157 -> a
-    127:127:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    127:127:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):158 -> a
-    1:5:boolean enqueueDeferredEnqueuerActions(com.android.tools.r8.graph.ProgramField):201:205 -> b
-    1:9:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):142:150 -> c
+    126:126:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):156 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    127:127:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isOptimizationAllowed():539:539 -> a
+    127:127:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):156 -> a
+    128:128:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
+    128:128:boolean lambda$isEligibleForPruning$0(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):157 -> a
+    1:5:boolean enqueueDeferredEnqueuerActions(com.android.tools.r8.graph.ProgramField):200:204 -> b
+    1:9:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):141:149 -> c
     10:10:boolean com.android.tools.r8.graph.FieldAccessInfo.isAccessedFromMethodHandle():50:50 -> c
-    10:10:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):151 -> c
-    11:29:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):152:170 -> c
-    30:45:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):169:184 -> c
+    10:10:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):150 -> c
+    11:29:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):151:169 -> c
+    30:45:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):168:183 -> c
     46:46:boolean com.android.tools.r8.graph.AbstractAccessContexts.hasAccesses():62:62 -> c
-    46:46:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):184 -> c
+    46:46:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):183 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    47:47:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):184:184 -> c
+    47:47:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):183:183 -> c
     48:48:boolean com.android.tools.r8.graph.AbstractAccessContexts.hasAccesses():62:62 -> c
-    48:48:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):184 -> c
+    48:48:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):183 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    49:56:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):185:192 -> c
+    49:56:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):184:191 -> c
     57:58:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):98:99 -> c
-    57:58:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):192 -> c
-    59:59:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):197:197 -> c
-com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter -> com.android.tools.r8.shaking.B:
+    57:58:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):191 -> c
+    59:59:boolean isEligibleForPruning(com.android.tools.r8.graph.ProgramField):196:196 -> c
+com.android.tools.r8.shaking.EnqueuerDeferredTracingRewriter -> com.android.tools.r8.shaking.F:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> c
@@ -115900,7 +116677,7 @@
     61:61:void removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):201:201 -> a
     61:61:void rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):143 -> a
     61:61:void rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):87 -> a
-    62:62:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():481:481 -> a
+    62:62:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():482:482 -> a
     62:62:void removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):201 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     62:62:void rewriteInstancePut(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut,java.util.Map):143 -> a
@@ -115923,7 +116700,7 @@
     82:82:void removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):201:201 -> a
     82:82:void rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):131 -> a
     82:82:void rewriteCode(com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.Map):79 -> a
-    83:83:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():481:481 -> a
+    83:83:boolean com.android.tools.r8.ir.code.Value.isMaybeNull():482:482 -> a
     83:83:void removeOrReplaceInstanceFieldInstructionWithNullCheck(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceFieldInstruction):201 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     83:83:void rewriteInstanceGet(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstanceGet,java.util.Set,java.util.Map):131 -> a
@@ -115944,13 +116721,13 @@
     99:101:void removeOrReplaceStaticFieldInstructionByInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.graph.ProgramField):218:220 -> a
     102:111:void removeOrReplaceStaticFieldInstructionByInitClass(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod,java.util.Map,com.android.tools.r8.graph.ProgramField):216:225 -> a
     1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover getDeadCodeRemover():58:58 -> b
-com.android.tools.r8.shaking.EnqueuerEvent -> com.android.tools.r8.internal.Ui:
+com.android.tools.r8.shaking.EnqueuerEvent -> com.android.tools.r8.internal.Yi:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent asClassEvent() -> a
     com.android.tools.r8.graph.DexDefinition getDefinition(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     boolean isClassEvent() -> b
-com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent -> com.android.tools.r8.internal.Pi:
+com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent -> com.android.tools.r8.internal.Ti:
     com.android.tools.r8.graph.DexType clazz -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):82:83 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent$ClassEnqueuerEvent asClassEvent() -> a
@@ -115959,7 +116736,7 @@
     2:2:com.android.tools.r8.graph.DexDefinition getDefinition(com.android.tools.r8.graph.DexDefinitionSupplier):88:88 -> a
     boolean isClassEvent() -> b
     1:1:com.android.tools.r8.graph.DexType getType():92:92 -> c
-com.android.tools.r8.shaking.EnqueuerEvent$InstantiatedClassEnqueuerEvent -> com.android.tools.r8.internal.Qi:
+com.android.tools.r8.shaking.EnqueuerEvent$InstantiatedClassEnqueuerEvent -> com.android.tools.r8.internal.Ui:
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):156:156 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexType):160:160 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):175:175 -> a
@@ -115973,7 +116750,7 @@
     178:181:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):176:179 -> a
     1:3:boolean equals(java.lang.Object):187:189 -> equals
     1:1:int hashCode():196:196 -> hashCode
-com.android.tools.r8.shaking.EnqueuerEvent$LiveClassEnqueuerEvent -> com.android.tools.r8.internal.Ri:
+com.android.tools.r8.shaking.EnqueuerEvent$LiveClassEnqueuerEvent -> com.android.tools.r8.internal.Vi:
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):109:109 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexType):113:113 -> <init>
     1:1:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):128:128 -> a
@@ -115987,19 +116764,19 @@
     131:134:com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens):129:132 -> a
     1:3:boolean equals(java.lang.Object):140:142 -> equals
     1:1:int hashCode():149:149 -> hashCode
-com.android.tools.r8.shaking.EnqueuerEvent$NoSuchEnqueuerEvent -> com.android.tools.r8.internal.Si:
+com.android.tools.r8.shaking.EnqueuerEvent$NoSuchEnqueuerEvent -> com.android.tools.r8.internal.Wi:
     com.android.tools.r8.shaking.EnqueuerEvent$NoSuchEnqueuerEvent INSTANCE -> a
     1:1:void <clinit>():59:59 -> <clinit>
     1:1:void <init>():61:61 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.shaking.EnqueuerEvent$NoSuchEnqueuerEvent get():64:64 -> c
-com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent -> com.android.tools.r8.internal.Ti:
+com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent -> com.android.tools.r8.internal.Xi:
     com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent INSTANCE -> a
     1:1:void <clinit>():202:202 -> <clinit>
     1:1:void <init>():204:204 -> <init>
     com.android.tools.r8.shaking.EnqueuerEvent rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.shaking.EnqueuerEvent$UnconditionalKeepInfoEvent get():207:207 -> c
-com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.C:
+com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.G:
     1:6: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):31:36 -> a
     7:7:void lambda$createForFinalTreeShaking$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):35:35 -> a
     8:8:com.android.tools.r8.shaking.Enqueuer createForInitialMainDexTracing(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo):44:44 -> a
@@ -116007,15 +116784,15 @@
     10:10: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):71:71 -> 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
     2:2:com.android.tools.r8.shaking.Enqueuer createForGenerateMainDexList(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):62:62 -> b
-com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.Wi:
+com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.aj:
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
-com.android.tools.r8.shaking.EnqueuerResult -> com.android.tools.r8.shaking.D:
+com.android.tools.r8.shaking.EnqueuerResult -> com.android.tools.r8.shaking.H:
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> a
     1:2:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness):11:12 -> <init>
     1:1:com.android.tools.r8.shaking.AppInfoWithLiveness getAppInfo():16:16 -> a
-com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.Xi:
+com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.bj:
     com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.androidapi.AndroidApiLevelCompute) -> a
-com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.g0:
+com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.k0:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
     java.util.Queue queue -> b
     1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.Queue,com.android.tools.r8.shaking.EnqueuerWorklist$1):28:28 -> <init>
@@ -116047,63 +116824,63 @@
     void enqueueTraceInvokeStaticAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod) -> c
     void enqueueTraceReflectiveFieldWriteAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod) -> c
     void enqueueTraceTypeReferenceAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason) -> c
-com.android.tools.r8.shaking.EnqueuerWorklist$AssertAction -> com.android.tools.r8.shaking.E:
+com.android.tools.r8.shaking.EnqueuerWorklist$AssertAction -> com.android.tools.r8.shaking.I:
     com.android.tools.r8.utils.Action assertion -> a
     1:2:void <init>(com.android.tools.r8.utils.Action):37:38 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):43:43 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction -> com.android.tools.r8.internal.Yi:
+com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction -> com.android.tools.r8.internal.cj:
     1:1:void <init>():30:30 -> <init>
     void run(com.android.tools.r8.shaking.Enqueuer) -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkAnnotationInstantiatedAction -> com.android.tools.r8.shaking.F:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkAnnotationInstantiatedAction -> com.android.tools.r8.shaking.J:
     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):128:130 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):135:135 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldAsReachableAction -> com.android.tools.r8.shaking.G:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldAsReachableAction -> com.android.tools.r8.shaking.K:
     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):88:91 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):96:96 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.shaking.H:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkFieldKeptAction -> com.android.tools.r8.shaking.L:
     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):189:191 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):196:196 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.shaking.I:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkInstantiatedAction -> com.android.tools.r8.shaking.M:
     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):111:115 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):120:120 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkInterfaceInstantiatedAction -> com.android.tools.r8.shaking.J:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkInterfaceInstantiatedAction -> com.android.tools.r8.shaking.N:
     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):143:145 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):150:150 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.shaking.K:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodKeptAction -> com.android.tools.r8.shaking.O:
     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):174:176 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):181:181 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.shaking.L:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkMethodLiveAction -> com.android.tools.r8.shaking.P:
     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):159:161 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):166:166 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.shaking.M:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableDirectAction -> com.android.tools.r8.shaking.Q:
     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):53:56 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):61:61 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.shaking.N:
+com.android.tools.r8.shaking.EnqueuerWorklist$MarkReachableSuperAction -> com.android.tools.r8.shaking.S:
     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):70:72 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):77:77 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$NonPushableEnqueuerWorklist -> com.android.tools.r8.shaking.O:
+com.android.tools.r8.shaking.EnqueuerWorklist$NonPushableEnqueuerWorklist -> com.android.tools.r8.shaking.T:
     1:1:void <init>(com.android.tools.r8.shaking.EnqueuerWorklist$PushableEnqueuerWorkList,com.android.tools.r8.shaking.EnqueuerWorklist$1):783:783 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.EnqueuerWorklist$PushableEnqueuerWorkList):786:786 -> <init>
     1:1:void enqueue(com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction):796:796 -> a
@@ -116131,7 +116908,7 @@
     2:2:void enqueueTraceInvokeStaticAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):901:901 -> c
     3:3:void enqueueTraceReflectiveFieldWriteAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):921:921 -> c
     4:4:void enqueueTraceTypeReferenceAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):931:931 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist$PushableEnqueuerWorkList -> com.android.tools.r8.shaking.P:
+com.android.tools.r8.shaking.EnqueuerWorklist$PushableEnqueuerWorkList -> com.android.tools.r8.shaking.U:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():607:607 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.Enqueuer):610:610 -> <init>
@@ -116141,17 +116918,17 @@
     5:5:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):639:639 -> a
     6:6:void enqueueMarkFieldAsReachableAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):645:645 -> a
     7:7:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):657:657 -> a
-    8:8:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    8:8:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     8:8: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):657 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    9:9:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     9: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):657 -> a
     10:12: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):657:659 -> a
     13:13:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):664:664 -> a
-    14:14:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    14:14:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     14:14:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):664 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    15:15:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    15:15:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     15:15:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):664 -> a
     16:18:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):664:666 -> a
     19:22:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason):679:682 -> a
@@ -116168,10 +116945,10 @@
     34:34:void enqueueTraceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):774:774 -> a
     1:1:com.android.tools.r8.shaking.EnqueuerWorklist nonPushable():615:615 -> b
     2:2:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):671:671 -> b
-    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> b
+    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> b
     3:3:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):671 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> b
+    4:4:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> b
     4:4:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):671 -> b
     5:7:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):671:673 -> b
     8:8:void enqueueTraceInvokeDirectAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):723:723 -> b
@@ -116182,93 +116959,93 @@
     2:10:void enqueueTraceReflectiveFieldWriteAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):760:768 -> c
     11:11:void enqueueTraceReflectiveFieldWriteAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod):762:762 -> c
     12:12:void enqueueTraceTypeReferenceAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):779:779 -> c
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceAnnotationAction -> com.android.tools.r8.shaking.Q:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceAnnotationAction -> com.android.tools.r8.shaking.V:
     com.android.tools.r8.graph.DexAnnotation$AnnotatedKind annotatedKind -> c
     com.android.tools.r8.graph.DexAnnotation annotation -> b
     com.android.tools.r8.graph.ProgramDefinition annotatedItem -> a
     1:4:void <init>(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):206:209 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):214:214 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceCodeAction -> com.android.tools.r8.shaking.S:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceCodeAction -> com.android.tools.r8.shaking.W:
     com.android.tools.r8.graph.ProgramMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):221:222 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):227:227 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceConstClassAction -> com.android.tools.r8.shaking.T:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceConstClassAction -> com.android.tools.r8.shaking.X:
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     boolean ignoreCompatRules -> c
     1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,boolean):237:240 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):245:245 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceDirectAndIndirectClassInitializers -> com.android.tools.r8.shaking.U:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceDirectAndIndirectClassInitializers -> com.android.tools.r8.shaking.Y:
     com.android.tools.r8.graph.DexProgramClass clazz -> a
     1:2:void <init>(com.android.tools.r8.graph.DexProgramClass):252:253 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):258:258 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceFieldAccessAction -> com.android.tools.r8.shaking.V:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceFieldAccessAction -> com.android.tools.r8.shaking.Z:
     com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata metadata -> c
     com.android.tools.r8.graph.DexField field -> a
     com.android.tools.r8.graph.ProgramMethod context -> b
     1:4:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):374:377 -> <init>
     1:3:boolean baseEquals(com.android.tools.r8.shaking.EnqueuerWorklist$TraceFieldAccessAction):381:383 -> a
     1:1:int hashCode():400:400 -> hashCode
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceInstanceFieldReadAction -> com.android.tools.r8.shaking.W:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceInstanceFieldReadAction -> com.android.tools.r8.shaking.a0:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):408:408 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):413:413 -> a
     1:5:boolean equals(java.lang.Object):421:425 -> equals
     1:1:int hashCode():430:430 -> hashCode
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceInstanceFieldWriteAction -> com.android.tools.r8.shaking.X:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceInstanceFieldWriteAction -> com.android.tools.r8.shaking.b0:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):438:438 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):443:443 -> a
     1:5:boolean equals(java.lang.Object):451:455 -> equals
     1:1:int hashCode():460:460 -> hashCode
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceInvokeDirectAction -> com.android.tools.r8.shaking.Y:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceInvokeDirectAction -> com.android.tools.r8.shaking.c0:
     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):267:269 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):274:274 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceInvokeStaticAction -> com.android.tools.r8.shaking.Z:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceInvokeStaticAction -> com.android.tools.r8.shaking.d0:
     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):283:285 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):290:290 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceMethodDefinitionExcludingCodeAction -> com.android.tools.r8.shaking.a0:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceMethodDefinitionExcludingCodeAction -> com.android.tools.r8.shaking.e0:
     com.android.tools.r8.graph.ProgramMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.ProgramMethod):297:298 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):303:303 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceNewInstanceAction -> com.android.tools.r8.shaking.b0:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceNewInstanceAction -> com.android.tools.r8.shaking.f0:
     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):312:314 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):319:319 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceReflectiveFieldAccessAction -> com.android.tools.r8.shaking.c0:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceReflectiveFieldAccessAction -> com.android.tools.r8.shaking.g0:
     com.android.tools.r8.graph.ProgramField field -> a
     com.android.tools.r8.shaking.Enqueuer$FieldAccessKind kind -> c
     com.android.tools.r8.graph.ProgramMethod context -> b
     1:4:void <init>(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessKind):333:336 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):341:341 -> a
-    2:2:boolean com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.isRead():1567:1567 -> a
+    2:2:boolean com.android.tools.r8.shaking.Enqueuer$FieldAccessKind.isRead():1574:1574 -> a
     2:2:void run(com.android.tools.r8.shaking.Enqueuer):342 -> a
     3:8:void run(com.android.tools.r8.shaking.Enqueuer):343:348 -> a
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceStaticFieldReadAction -> com.android.tools.r8.shaking.d0:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceStaticFieldReadAction -> com.android.tools.r8.shaking.h0:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):468:468 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):473:473 -> a
     1:5:boolean equals(java.lang.Object):481:485 -> equals
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceStaticFieldWriteAction -> com.android.tools.r8.shaking.e0:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceStaticFieldWriteAction -> com.android.tools.r8.shaking.i0:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer$FieldAccessMetadata):493:493 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):498:498 -> a
     1:5:boolean equals(java.lang.Object):506:510 -> equals
     1:1:int hashCode():515:515 -> hashCode
-com.android.tools.r8.shaking.EnqueuerWorklist$TraceTypeReferenceAction -> com.android.tools.r8.shaking.f0:
+com.android.tools.r8.shaking.EnqueuerWorklist$TraceTypeReferenceAction -> com.android.tools.r8.shaking.j0:
     com.android.tools.r8.shaking.KeepReason reason -> b
     com.android.tools.r8.graph.DexProgramClass clazz -> a
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):357:359 -> <init>
     1:1:void run(com.android.tools.r8.shaking.Enqueuer):364:364 -> a
-com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier -> com.android.tools.r8.shaking.j0:
+com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier -> com.android.tools.r8.shaking.n0:
     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:1:com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder builder():65:65 -> a
     2:3:void modify(com.android.tools.r8.graph.AppView):69:70 -> a
     4:7: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$Builder -> com.android.tools.r8.shaking.h0:
+com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder -> com.android.tools.r8.shaking.l0:
     java.util.Map newFieldAccessContexts -> a
     1:1:void <init>():84:84 -> <init>
     2:2:void <init>():81:81 -> <init>
@@ -116279,7 +117056,7 @@
     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.i0:
+com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$FieldAccessContexts -> com.android.tools.r8.shaking.m0:
     com.android.tools.r8.graph.AbstractAccessContexts writesWithContexts -> b
     com.android.tools.r8.graph.AbstractAccessContexts readsWithContexts -> a
     boolean $assertionsDisabled -> c
@@ -116310,7 +117087,7 @@
     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.cl:
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.hl:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -116329,8 +117106,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.Mm:
-com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.l0:
+com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.Rm:
+com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.p0:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> k
@@ -116380,7 +117157,7 @@
     168:168:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):176 -> a
     169:169:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):179:179 -> a
     170:170:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):183:183 -> a
-    171:171:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():818:818 -> a
+    171:171:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():832:832 -> a
     171:171:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):183 -> a
     172:172:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):184:184 -> a
     173:178:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):183:188 -> a
@@ -116455,14 +117232,14 @@
     27:27:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$1(com.android.tools.r8.graph.DexType):472 -> b
     28:30:com.android.tools.r8.experimental.graphinfo.ClassGraphNode lambda$getClassGraphNode$1(com.android.tools.r8.graph.DexType):473:475 -> b
     1:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):256:265 -> c
-com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.shaking.k0:
+com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness -> com.android.tools.r8.shaking.o0:
     com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness INSTANCE -> a
     1:1:void <clinit>():329:329 -> <clinit>
     1:1:void <init>():331:331 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():337:337 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):342:342 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness access$000():327:327 -> b
-com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.shaking.m0:
+com.android.tools.r8.shaking.IfRuleClassPartEquivalence -> com.android.tools.r8.shaking.q0:
     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
@@ -116477,7 +117254,7 @@
     41:45:int com.android.tools.r8.com.google.common.collect.Iterables.size(java.lang.Iterable):126 -> a
     41:45:int doHash(com.android.tools.r8.shaking.ProguardIfRule):56 -> a
     41:45:int doHash(java.lang.Object):11 -> a
-com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.shaking.n0:
+com.android.tools.r8.shaking.IfRuleEvaluator -> com.android.tools.r8.shaking.r0:
     java.util.concurrent.ExecutorService executorService -> d
     com.android.tools.r8.graph.AppView appView -> a
     java.util.List futures -> e
@@ -116491,19 +117268,19 @@
     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):48:64 -> <init>
     1:19:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():68:86 -> a
     20:28:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():85:93 -> a
-    29:29:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):820:820 -> a
+    29:29:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):829:829 -> a
     29:29:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):202 -> a
     29:29:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():95 -> a
-    30:31:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):824:825 -> a
+    30:31:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):833:834 -> a
     30:31:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):205 -> a
     30:31:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():95 -> a
     32:42:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):208:218 -> a
     32:42:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():95 -> a
     43:71:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():99:127 -> a
-    72:72:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):820:820 -> a
+    72:72:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):829:829 -> a
     72:72:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):202 -> a
     72:72:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():129 -> a
-    73:74:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):824:825 -> a
+    73:74:boolean com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder.satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):833:834 -> a
     73:74:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):205 -> a
     73:74:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet run():129 -> a
     75:85:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):208:218 -> a
@@ -116524,7 +117301,7 @@
     136:136:void lambda$run$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData,java.util.List,com.android.tools.r8.shaking.ProguardIfRule):138:138 -> a
     137:146:boolean isEffectivelyLive(com.android.tools.r8.graph.DexProgramClass):184:193 -> a
     147:148:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):225:226 -> a
-    149:149:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():702:702 -> a
+    149:149:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():716:716 -> a
     149:149:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):227 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     150:158:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):227:235 -> a
@@ -116532,7 +117309,7 @@
     180:219:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):251:290 -> a
     220:225:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):289:294 -> a
     226:233:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):293:300 -> a
-    234:234:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():702:702 -> a
+    234:234:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():716:716 -> a
     234:234:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):306 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     235:235:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):306:306 -> a
@@ -116550,7 +117327,7 @@
     252:260:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(java.util.List,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):240:248 -> a
     261:300:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):325:364 -> a
     1:1:com.android.tools.r8.graph.DexClassAndMethod lambda$evaluateIfRuleMembersAndMaterialize$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):294:294 -> b
-com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.shaking.p0:
+com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.shaking.t0:
     com.android.tools.r8.shaking.InlineRule$Type type -> r
     int $r8$clinit -> s
     1:15: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.InlineRule$Type):75:89 -> <init>
@@ -116566,17 +117343,17 @@
     127:127:java.lang.String typeString():106:106 -> C
     128:128:java.lang.String typeString():104:104 -> C
     1:1:com.android.tools.r8.shaking.InlineRule$Type getType():97:97 -> D
-com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.shaking.o0:
+com.android.tools.r8.shaking.InlineRule$Builder -> com.android.tools.r8.shaking.s0:
     com.android.tools.r8.shaking.InlineRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.InlineRule$1):20:20 -> <init>
     2:2:void <init>():23:23 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.InlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.qq:
+com.android.tools.r8.shaking.InlineRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.vq:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.shaking.InstantiatedObject -> com.android.tools.r8.shaking.s0:
+com.android.tools.r8.shaking.InstantiatedObject -> com.android.tools.r8.shaking.w0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:1:void <init>():10:10 -> <init>
@@ -116589,17 +117366,17 @@
     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.q0:
+com.android.tools.r8.shaking.InstantiatedObject$InstantiatedClass -> com.android.tools.r8.shaking.u0:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():46:46 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexProgramClass):49:51 -> <init>
     1:1:com.android.tools.r8.graph.DexProgramClass asClass():61:61 -> a
-com.android.tools.r8.shaking.InstantiatedObject$InstantiatedLambda -> com.android.tools.r8.shaking.r0:
+com.android.tools.r8.shaking.InstantiatedObject$InstantiatedLambda -> com.android.tools.r8.shaking.v0:
     com.android.tools.r8.ir.desugar.LambdaDescriptor lambdaDescriptor -> b
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaDescriptor):68:69 -> <init>
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor asLambda():79:79 -> b
-com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.fr:
+com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.kr:
     com.android.tools.r8.shaking.InstantiationReason NEW_INSTANCE_INSTRUCTION -> d
     com.android.tools.r8.shaking.InstantiationReason REFERENCED_IN_METHOD_HANDLE -> e
     com.android.tools.r8.shaking.InstantiationReason KEEP_RULE -> b
@@ -116607,68 +117384,102 @@
     com.android.tools.r8.shaking.InstantiationReason REFLECTION -> f
     1:5:void <clinit>():8:12 -> <clinit>
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
-com.android.tools.r8.shaking.KeepClassInfo -> com.android.tools.r8.shaking.v0:
-    com.android.tools.r8.shaking.KeepClassInfo BOTTOM -> j
-    com.android.tools.r8.shaking.KeepClassInfo TOP -> i
-    boolean $assertionsDisabled -> k
+com.android.tools.r8.shaking.KeepClassInfo -> com.android.tools.r8.shaking.z0:
+    com.android.tools.r8.shaking.KeepClassInfo BOTTOM -> k
+    com.android.tools.r8.shaking.KeepClassInfo TOP -> j
+    boolean checkEnumUnboxed -> i
+    boolean $assertionsDisabled -> l
     1:7:void <clinit>():15:21 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.KeepClassInfo$Builder,com.android.tools.r8.shaking.KeepClassInfo$1):15:15 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.KeepClassInfo$Builder):36:36 -> <init>
-    1:4:boolean isRepackagingAllowed(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):52:55 -> a
-    5:9:boolean isKotlinMetadataClassKept(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions,java.util.function.Function,java.util.function.Function):71:75 -> a
+    2:3:void <init>(com.android.tools.r8.shaking.KeepClassInfo$Builder):38:39 -> <init>
+    1:4:boolean isRepackagingAllowed(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):63:66 -> a
+    5:9:boolean isKotlinMetadataClassKept(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.InternalOptions,java.util.function.Function,java.util.function.Function):82:86 -> a
     1:1:com.android.tools.r8.shaking.KeepClassInfo access$200():15:15 -> j
     1:1:com.android.tools.r8.shaking.KeepClassInfo access$300():15:15 -> k
     1:1:com.android.tools.r8.shaking.KeepClassInfo bottom():28:28 -> l
-    1:1:com.android.tools.r8.shaking.KeepClassInfo$Builder builder():41:41 -> m
-    1:1:com.android.tools.r8.shaking.KeepClassInfo top():24:24 -> n
-    1:1:boolean isTop():80 -> n
-    2:2:boolean isTop():80:80 -> n
-    1:1:com.android.tools.r8.shaking.KeepClassInfo$Joiner joiner():45:45 -> o
-    2:2:com.android.tools.r8.shaking.KeepClassInfo top():24:24 -> o
-    2:2:boolean isTop():80 -> o
-    2:2:com.android.tools.r8.shaking.KeepClassInfo$Joiner joiner():45 -> o
-    3:3:boolean isTop():80:80 -> o
-    3:3:com.android.tools.r8.shaking.KeepClassInfo$Joiner joiner():45 -> o
-    4:5:com.android.tools.r8.shaking.KeepClassInfo$Joiner joiner():45:46 -> o
-    1:1:com.android.tools.r8.shaking.KeepClassInfo bottom():28:28 -> p
-    1:1:com.android.tools.r8.shaking.KeepClassInfo$Joiner newEmptyJoiner():32 -> p
-    2:2:com.android.tools.r8.shaking.KeepClassInfo$Joiner newEmptyJoiner():32:32 -> p
-    1:1:com.android.tools.r8.shaking.KeepClassInfo top():24:24 -> q
-com.android.tools.r8.shaking.KeepClassInfo$Builder -> com.android.tools.r8.shaking.t0:
-    1:1:void <init>(com.android.tools.r8.shaking.KeepClassInfo$1):88:88 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.shaking.KeepClassInfo$1):88:88 -> <init>
-    3:3:void <init>():91:91 -> <init>
-    4:4:void <init>(com.android.tools.r8.shaking.KeepClassInfo):95:95 -> <init>
-    1:1:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):88:88 -> b
-    2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepClassInfo):115:115 -> b
-    2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):88 -> b
-    1:1:com.android.tools.r8.shaking.KeepClassInfo doBuild():120:120 -> h
-    1:1:com.android.tools.r8.shaking.KeepInfo doBuild():88 -> h
-    1:1:com.android.tools.r8.shaking.KeepClassInfo getBottomInfo():105:105 -> i
-    1:1:com.android.tools.r8.shaking.KeepInfo getBottomInfo():88 -> i
-    1:1:com.android.tools.r8.shaking.KeepClassInfo getTopInfo():100:100 -> j
-    1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():88 -> j
+    1:1:com.android.tools.r8.shaking.KeepClassInfo$Builder builder():44:44 -> m
+    1:1:boolean internalIsCheckEnumUnboxedEnabled():52:52 -> n
+    1:1:boolean internalIsCheckEnumUnboxedEnabled():52:52 -> o
+    1:1:boolean isCheckEnumUnboxedEnabled(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):48 -> o
+    1:1:com.android.tools.r8.shaking.KeepClassInfo top():24:24 -> p
+    1:1:boolean isTop():91 -> p
+    2:2:boolean isTop():91:91 -> p
+    1:1:com.android.tools.r8.shaking.KeepClassInfo$Joiner joiner():56:56 -> q
+    2:2:com.android.tools.r8.shaking.KeepClassInfo top():24:24 -> q
+    2:2:boolean isTop():91 -> q
+    2:2:com.android.tools.r8.shaking.KeepClassInfo$Joiner joiner():56 -> q
+    3:3:boolean isTop():91:91 -> q
+    3:3:com.android.tools.r8.shaking.KeepClassInfo$Joiner joiner():56 -> q
+    4:5:com.android.tools.r8.shaking.KeepClassInfo$Joiner joiner():56:57 -> q
+    1:1:com.android.tools.r8.shaking.KeepClassInfo bottom():28:28 -> r
+    1:1:com.android.tools.r8.shaking.KeepClassInfo$Joiner newEmptyJoiner():32 -> r
+    2:2:com.android.tools.r8.shaking.KeepClassInfo$Joiner newEmptyJoiner():32:32 -> r
+    1:1:com.android.tools.r8.shaking.KeepClassInfo top():24:24 -> s
+com.android.tools.r8.shaking.KeepClassInfo$Builder -> com.android.tools.r8.shaking.x0:
+    boolean checkEnumUnboxed -> j
+    1:1:void <init>(com.android.tools.r8.shaking.KeepClassInfo$1):99:99 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.shaking.KeepClassInfo$1):99:99 -> <init>
+    3:3:void <init>():104:104 -> <init>
+    4:5:void <init>(com.android.tools.r8.shaking.KeepClassInfo):108:109 -> <init>
+    1:1:com.android.tools.r8.shaking.KeepClassInfo$Builder setCheckEnumUnboxed(boolean):119:119 -> A
+    1:1:com.android.tools.r8.shaking.KeepClassInfo$Builder setCheckEnumUnboxed():124 -> A
+    1:1:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):99:99 -> a
+    2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepClassInfo):153:153 -> a
+    2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):99 -> a
+    3:3:boolean isCheckEnumUnboxedEnabled():115:115 -> a
+    3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepClassInfo):154 -> a
+    3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):99 -> a
+    4:4:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepClassInfo):154:154 -> a
+    4:4:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepInfo):99 -> a
+    1:1:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):99:99 -> b
+    2:2:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepClassInfo):153:153 -> b
+    2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepClassInfo):148 -> b
+    2:2:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):99 -> b
+    3:3:boolean isCheckEnumUnboxedEnabled():115:115 -> b
+    3:3:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepClassInfo):154 -> b
+    3:3:boolean isEqualTo(com.android.tools.r8.shaking.KeepClassInfo):148 -> b
+    3:3:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):99 -> b
+    4:4:boolean internalIsEqualTo(com.android.tools.r8.shaking.KeepClassInfo):154:154 -> b
+    4:4:boolean isEqualTo(com.android.tools.r8.shaking.KeepClassInfo):148 -> b
+    4:4:boolean isEqualTo(com.android.tools.r8.shaking.KeepInfo):99 -> b
+    1:1:com.android.tools.r8.shaking.KeepClassInfo doBuild():159:159 -> h
+    1:1:com.android.tools.r8.shaking.KeepInfo doBuild():99 -> h
+    1:1:com.android.tools.r8.shaking.KeepClassInfo getBottomInfo():138:138 -> i
+    1:1:com.android.tools.r8.shaking.KeepInfo getBottomInfo():99 -> i
+    1:1:com.android.tools.r8.shaking.KeepClassInfo getTopInfo():133:133 -> j
+    1:1:com.android.tools.r8.shaking.KeepInfo getTopInfo():99 -> j
+    1:1:com.android.tools.r8.shaking.KeepInfo$Builder makeTop():99:99 -> t
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> v
-com.android.tools.r8.shaking.KeepClassInfo$Joiner -> com.android.tools.r8.shaking.u0:
-    1:1:void <init>(com.android.tools.r8.shaking.KeepClassInfo):127:127 -> <init>
+    1:1:boolean isCheckEnumUnboxedEnabled():115:115 -> x
+    1:1:com.android.tools.r8.shaking.KeepClassInfo$Builder makeBottom():169:169 -> y
+    2:2:com.android.tools.r8.shaking.KeepClassInfo$Builder setCheckEnumUnboxed(boolean):119:119 -> y
+    2:2:com.android.tools.r8.shaking.KeepClassInfo$Builder unsetCheckEnumUnboxed():128 -> y
+    2:2:com.android.tools.r8.shaking.KeepClassInfo$Builder makeBottom():169 -> y
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+    1:1:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():164:164 -> z
+    2:2:com.android.tools.r8.shaking.KeepClassInfo$Builder setCheckEnumUnboxed(boolean):119:119 -> z
+    2:2:com.android.tools.r8.shaking.KeepClassInfo$Builder unsetCheckEnumUnboxed():128 -> z
+    2:2:com.android.tools.r8.shaking.KeepClassInfo$Builder makeTop():164 -> z
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
+com.android.tools.r8.shaking.KeepClassInfo$Joiner -> com.android.tools.r8.shaking.y0:
+    1:1:void <init>(com.android.tools.r8.shaking.KeepClassInfo):176:176 -> <init>
     com.android.tools.r8.shaking.KeepClassInfo$Joiner asClassJoiner() -> a
-    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):124:124 -> a
-    2:2:com.android.tools.r8.shaking.KeepClassInfo$Joiner merge(com.android.tools.r8.shaking.KeepClassInfo$Joiner):138:138 -> a
-    2:2:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):124 -> a
-    3:3:com.android.tools.r8.shaking.KeepClassInfo$Joiner merge(com.android.tools.r8.shaking.KeepClassInfo$Joiner):138:138 -> a
+    1:1:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):173:173 -> a
+    2:3:com.android.tools.r8.shaking.KeepClassInfo$Joiner merge(com.android.tools.r8.shaking.KeepClassInfo$Joiner):192:193 -> a
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> m
-com.android.tools.r8.shaking.KeepConstantArgumentRule -> com.android.tools.r8.shaking.x0:
+    1:1:com.android.tools.r8.shaking.KeepClassInfo$Joiner setCheckEnumUnboxed():180:180 -> p
+com.android.tools.r8.shaking.KeepConstantArgumentRule -> com.android.tools.r8.shaking.B0:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.KeepConstantArgumentRule$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>
     1:1:java.lang.String typeString():81:81 -> C
-com.android.tools.r8.shaking.KeepConstantArgumentRule$Builder -> com.android.tools.r8.shaking.w0:
+com.android.tools.r8.shaking.KeepConstantArgumentRule$Builder -> com.android.tools.r8.shaking.A0:
     1:1:void <init>(com.android.tools.r8.shaking.KeepConstantArgumentRule$1):14:14 -> <init>
     2:2:void <init>():18:18 -> <init>
     1:11:com.android.tools.r8.shaking.KeepConstantArgumentRule build():28:38 -> a
     1:11:com.android.tools.r8.shaking.ProguardClassSpecification build():14 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.KeepFieldInfo -> com.android.tools.r8.shaking.A0:
+com.android.tools.r8.shaking.KeepFieldInfo -> com.android.tools.r8.shaking.E0:
     boolean allowFieldTypeStrengthening -> i
     boolean $assertionsDisabled -> l
     com.android.tools.r8.shaking.KeepFieldInfo TOP -> j
@@ -116700,7 +117511,7 @@
     1:1:com.android.tools.r8.shaking.KeepFieldInfo$Joiner newEmptyJoiner():24 -> s
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Joiner newEmptyJoiner():24:24 -> s
     1:1:com.android.tools.r8.shaking.KeepFieldInfo top():16:16 -> t
-com.android.tools.r8.shaking.KeepFieldInfo$Builder -> com.android.tools.r8.shaking.y0:
+com.android.tools.r8.shaking.KeepFieldInfo$Builder -> com.android.tools.r8.shaking.C0:
     boolean allowFieldTypeStrengthening -> j
     1:1:void <init>(com.android.tools.r8.shaking.KeepFieldInfo$1):64:64 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.KeepFieldInfo,com.android.tools.r8.shaking.KeepFieldInfo$1):64:64 -> <init>
@@ -116746,7 +117557,7 @@
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder allowFieldTypeStrengthening():97 -> z
     2:2:com.android.tools.r8.shaking.KeepFieldInfo$Builder makeBottom():84 -> z
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-com.android.tools.r8.shaking.KeepFieldInfo$Joiner -> com.android.tools.r8.shaking.z0:
+com.android.tools.r8.shaking.KeepFieldInfo$Joiner -> com.android.tools.r8.shaking.D0:
     1:1:void <init>(com.android.tools.r8.shaking.KeepFieldInfo):139:139 -> <init>
     1:1:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):136:136 -> a
     2:4:com.android.tools.r8.shaking.KeepFieldInfo$Joiner merge(com.android.tools.r8.shaking.KeepFieldInfo$Joiner):155:157 -> a
@@ -116754,7 +117565,7 @@
     com.android.tools.r8.shaking.KeepFieldInfo$Joiner asFieldJoiner() -> b
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> m
     1:1:com.android.tools.r8.shaking.KeepFieldInfo$Joiner disallowFieldTypeStrengthening():143:143 -> p
-com.android.tools.r8.shaking.KeepInfo -> com.android.tools.r8.shaking.D0:
+com.android.tools.r8.shaking.KeepInfo -> com.android.tools.r8.shaking.H0:
     boolean allowShrinking -> e
     boolean allowSignatureRemoval -> f
     boolean checkDiscarded -> g
@@ -116772,7 +117583,7 @@
     3:3:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$newEmptyJoinerFor$1(com.android.tools.r8.graph.DexField):64:64 -> a
     4:4:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$newEmptyJoinerFor$2(com.android.tools.r8.graph.DexMethod):65:65 -> a
     5:5:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):109:109 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():670:670 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():675:675 -> a
     6:6:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):109 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:boolean internalIsMinificationAllowed():113:113 -> a
@@ -116806,22 +117617,22 @@
     22:22:boolean internalIsCheckDiscardedEnabled():89:89 -> a
     22:22:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):239 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    23:23:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():747:747 -> a
+    23:23:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():752:752 -> a
     23:23:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):184 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:24:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():748:748 -> a
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():753:753 -> a
     24:24:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):184 -> a
     25:25:boolean internalIsAccessModificationAllowed():189:189 -> a
     25:25:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):184 -> a
     1:1:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):123:123 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():675:675 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():680:680 -> b
     2:2:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):123 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:3:boolean internalIsOptimizationAllowed():127:127 -> b
     3:3:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):123 -> b
     4:4:boolean internalIsAccessModificationRequiredForRepackaging():172:172 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():685:685 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():660 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():690:690 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():665 -> b
     5:5:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):77 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     6:6:boolean internalIsAnnotationRemovalAllowed():81:81 -> b
@@ -116829,18 +117640,18 @@
     1:1:boolean internalIsAnnotationRemovalAllowed():81:81 -> c
     2:2:boolean isPinned(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):99:99 -> c
     3:3:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):206:206 -> c
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():685:685 -> c
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():690:690 -> c
     4:4:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):209 -> c
     5:5:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):209:209 -> c
     1:1:boolean internalIsCheckDiscardedEnabled():89:89 -> d
     2:2:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):137:137 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():665:665 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():670:670 -> d
     3:3:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):137 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean internalIsShrinkingAllowed():141:141 -> d
     4:4:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):137 -> d
     5:5:boolean isSignatureRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):151:151 -> d
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():685:685 -> d
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():690:690 -> d
     6:6:boolean isSignatureRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):154 -> d
     7:7:boolean internalIsSignatureRemovalAllowed():159:159 -> d
     7:7:boolean isSignatureRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):155 -> d
@@ -116850,7 +117661,7 @@
     1:1:boolean internalIsSignatureRemovalAllowed():159:159 -> h
     1:1:boolean internalIsCheckDiscardedEnabled():89:89 -> i
     1:1:boolean isCheckDiscardedEnabled(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):85 -> i
-com.android.tools.r8.shaking.KeepInfo$Builder -> com.android.tools.r8.shaking.B0:
+com.android.tools.r8.shaking.KeepInfo$Builder -> com.android.tools.r8.shaking.F0:
     boolean requireAccessModificationForRepackaging -> i
     boolean allowOptimization -> e
     boolean allowShrinking -> f
@@ -116946,7 +117757,7 @@
     com.android.tools.r8.shaking.KeepInfo$Builder self() -> v
     1:2:com.android.tools.r8.shaking.KeepInfo$Builder setCheckDiscarded(boolean):405:406 -> w
     1:2:com.android.tools.r8.shaking.KeepInfo$Builder setCheckDiscarded():410 -> w
-com.android.tools.r8.shaking.KeepInfo$Joiner -> com.android.tools.r8.shaking.C0:
+com.android.tools.r8.shaking.KeepInfo$Joiner -> com.android.tools.r8.shaking.G0:
     java.util.Set rules -> c
     java.util.Set reasons -> b
     com.android.tools.r8.shaking.KeepInfo$Builder builder -> a
@@ -116982,7 +117793,7 @@
     com.android.tools.r8.shaking.KeepInfo$Joiner self() -> m
     1:2:com.android.tools.r8.shaking.KeepInfo$Joiner setCheckDiscarded():596:597 -> n
     1:2:com.android.tools.r8.shaking.KeepInfo$Joiner top():551:552 -> o
-com.android.tools.r8.shaking.KeepInfoCollection -> com.android.tools.r8.shaking.F0:
+com.android.tools.r8.shaking.KeepInfoCollection -> com.android.tools.r8.shaking.J0:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():40:40 -> <clinit>
     1:1:void <init>():40:40 -> <init>
@@ -117035,7 +117846,7 @@
     35:35:com.android.tools.r8.shaking.KeepInfo getInfo(com.android.tools.r8.graph.ProgramDefinition):153:153 -> a
     void forEachPinnedMethod(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions) -> b
     void forEachPinnedType(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions) -> c
-com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection -> com.android.tools.r8.shaking.E0:
+com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection -> com.android.tools.r8.shaking.I0:
     java.util.Map keepClassInfo -> b
     java.util.Map keepMethodInfo -> c
     java.util.Map keepFieldInfo -> d
@@ -117058,70 +117869,76 @@
     21:23:com.android.tools.r8.shaking.KeepInfo com.android.tools.r8.shaking.KeepInfo$Joiner.join():628:630 -> a
     21:23:void joinField(com.android.tools.r8.graph.ProgramField,java.util.function.Consumer):495 -> a
     24:26:void joinField(com.android.tools.r8.graph.ProgramField,java.util.function.Consumer):495:497 -> a
-    27:34:void removeKeepInfoForMergedClasses(com.android.tools.r8.graph.PrunedItems):249:256 -> a
-    35:93:com.android.tools.r8.shaking.KeepInfoCollection rewrite(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions):275:333 -> a
-    94:98:com.android.tools.r8.shaking.KeepInfoCollection rewrite(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions):332:336 -> a
-    99:99:com.android.tools.r8.shaking.KeepInfoCollection rewrite(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions):334:334 -> a
-    100:100:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):278:278 -> a
-    101:101:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    101:101:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):278 -> a
-    102:106:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):279:283 -> a
-    107:107:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):282:282 -> a
-    108:114:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):279:285 -> a
-    115:115:boolean lambda$rewrite$1(java.lang.Boolean):300:300 -> a
-    116:116:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):324:324 -> a
-    117:117:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    117:117:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):324 -> a
-    118:121:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):325:328 -> a
-    122:122:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):333:333 -> a
-    122:122:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):310 -> a
+    27:31:void removeKeepInfoForMergedClasses(com.android.tools.r8.graph.PrunedItems):249:253 -> a
+    32:32:boolean com.android.tools.r8.graph.PrunedItems.hasRemovedMembers():91:91 -> a
+    32:32:void removeKeepInfoForMergedClasses(com.android.tools.r8.graph.PrunedItems):255 -> a
+    33:33:void removeKeepInfoForMergedClasses(com.android.tools.r8.graph.PrunedItems):256:256 -> a
+    34:92:com.android.tools.r8.shaking.KeepInfoCollection rewrite(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions):275:333 -> a
+    93:97:com.android.tools.r8.shaking.KeepInfoCollection rewrite(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions):332:336 -> a
+    98:98:com.android.tools.r8.shaking.KeepInfoCollection rewrite(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions):334:334 -> a
+    99:99:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):278:278 -> a
+    100:100:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    100:100:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):278 -> a
+    101:105:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):279:283 -> a
+    106:106:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):282:282 -> a
+    107:113:void lambda$rewrite$0(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):279:285 -> a
+    114:114:boolean lambda$rewrite$1(java.lang.Boolean):300:300 -> a
+    115:115:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):324:324 -> a
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    116:116:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):324 -> a
+    117:120:com.android.tools.r8.graph.DexType lambda$rewrite$4(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DexType):325:328 -> a
+    121:121:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.GraphLens.getRenamedFieldSignature(com.android.tools.r8.graph.DexField):333:333 -> a
+    121:121:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):310 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    123:126:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):311:311 -> a
-    129:130:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):314:315 -> a
-    131:136:java.util.Map rewriteRuleInstances(java.util.Map,java.util.function.Function,java.util.function.Supplier):342:342 -> a
-    137:137:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):345:345 -> a
-    137:137:void lambda$rewrite$2(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):290 -> a
+    122:125:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):311:311 -> a
+    128:129:void lambda$rewrite$3(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.utils.InternalOptions,java.util.Map,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):314:315 -> a
+    130:135:java.util.Map rewriteRuleInstances(java.util.Map,java.util.function.Function,java.util.function.Supplier):342:342 -> a
+    136:136:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):345:345 -> a
+    136:136:void lambda$rewrite$2(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):290 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    138:140:void lambda$rewrite$2(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):291:291 -> a
-    143:147:void lambda$rewrite$2(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):294:298 -> a
-    148:152:void lambda$rewrite$2(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):296:300 -> a
-    153:160:void lambda$rewrite$2(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):295:302 -> a
-    161:161:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
-    161:161:void lambda$rewrite$2(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):302 -> a
-    162:164:void lambda$rewrite$2(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):301:303 -> a
-    165:165:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$rewriteRuleInstances$5(java.util.function.Supplier,java.lang.Object,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.shaking.KeepInfo$Joiner):348:348 -> a
-    166:182:void forEachRuleInstance(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer):357:373 -> a
-    183:185:void lambda$forEachRuleInstance$6(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo$Joiner):359:361 -> a
-    186:189:void lambda$forEachRuleInstance$7(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):367:370 -> a
-    190:193:void lambda$forEachRuleInstance$8(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):376:379 -> a
-    194:198:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):403:407 -> a
-    199:199:void lambda$evaluateMethodRule$11(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):404:404 -> a
+    137:139:void lambda$rewrite$2(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):291:291 -> a
+    142:146:void lambda$rewrite$2(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):294:298 -> a
+    147:151:void lambda$rewrite$2(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):296:300 -> a
+    152:159:void lambda$rewrite$2(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):295:302 -> a
+    160:160:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> a
+    160:160:void lambda$rewrite$2(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):302 -> a
+    161:163:void lambda$rewrite$2(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):301:303 -> a
+    164:164:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$rewriteRuleInstances$5(java.util.function.Supplier,java.lang.Object,com.android.tools.r8.shaking.KeepInfo$Joiner,com.android.tools.r8.shaking.KeepInfo$Joiner):348:348 -> a
+    165:181:void forEachRuleInstance(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer):357:373 -> a
+    182:184:void lambda$forEachRuleInstance$6(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo$Joiner):359:361 -> a
+    185:188:void lambda$forEachRuleInstance$7(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):367:370 -> a
+    189:192:void lambda$forEachRuleInstance$8(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):376:379 -> a
+    193:197:void evaluateMethodRule(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):403:407 -> a
+    198:198:void lambda$evaluateMethodRule$11(com.android.tools.r8.shaking.KeepMethodInfo$Joiner,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):404:404 -> a
+    199:199:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):413:413 -> a
     200:200:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):413:413 -> a
-    201:201:com.android.tools.r8.shaking.KeepClassInfo getClassInfo(com.android.tools.r8.graph.DexProgramClass):413:413 -> a
-    201:201:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):429 -> a
-    202:207:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):430:435 -> a
-    208:210:com.android.tools.r8.shaking.KeepInfo com.android.tools.r8.shaking.KeepInfo$Joiner.join():628:630 -> a
-    208:210:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):436 -> a
-    211:213:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):436:438 -> a
-    214:215:com.android.tools.r8.shaking.KeepMethodInfo getMethodInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):418:419 -> a
-    216:217:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):424:425 -> a
-    218:218:void keepMethod(com.android.tools.r8.graph.ProgramMethod):461:461 -> a
-    219:219:void keepField(com.android.tools.r8.graph.ProgramField):502:502 -> a
-    220:220:com.android.tools.r8.shaking.KeepInfoCollection mutate(java.util.function.Consumer):507:507 -> a
-    221:221:boolean verifyPinnedTypesAreLive(java.util.Set,com.android.tools.r8.utils.InternalOptions):513:513 -> a
-    222:222:void lambda$verifyPinnedTypesAreLive$12(com.android.tools.r8.utils.InternalOptions,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):515:515 -> a
-    223:224:void lambda$forEachPinnedType$13(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):524:525 -> a
-    225:226:void lambda$forEachPinnedMethod$14(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):534:535 -> a
-    227:227:void forEachPinnedField(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):542:542 -> a
-    228:229:void lambda$forEachPinnedField$15(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):544:545 -> a
-    1:8:void removeKeepInfoForPrunedItems(com.android.tools.r8.graph.PrunedItems):261:268 -> b
-    9:9:void keepClass(com.android.tools.r8.graph.DexProgramClass):443:443 -> b
-    10:10:void forEachPinnedMethod(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):532:532 -> b
+    200:200:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):429 -> a
+    201:206:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):430:435 -> a
+    207:209:com.android.tools.r8.shaking.KeepInfo com.android.tools.r8.shaking.KeepInfo$Joiner.join():628:630 -> a
+    207:209:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):436 -> a
+    210:212:void joinClass(com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer):436:438 -> a
+    213:214:com.android.tools.r8.shaking.KeepMethodInfo getMethodInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):418:419 -> a
+    215:216:com.android.tools.r8.shaking.KeepFieldInfo getFieldInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass):424:425 -> a
+    217:217:void keepMethod(com.android.tools.r8.graph.ProgramMethod):461:461 -> a
+    218:218:void keepField(com.android.tools.r8.graph.ProgramField):502:502 -> a
+    219:219:com.android.tools.r8.shaking.KeepInfoCollection mutate(java.util.function.Consumer):507:507 -> a
+    220:220:boolean verifyPinnedTypesAreLive(java.util.Set,com.android.tools.r8.utils.InternalOptions):513:513 -> a
+    221:221:void lambda$verifyPinnedTypesAreLive$12(com.android.tools.r8.utils.InternalOptions,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):515:515 -> a
+    222:223:void lambda$forEachPinnedType$13(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepClassInfo):524:525 -> a
+    224:225:void lambda$forEachPinnedMethod$14(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepMethodInfo):534:535 -> a
+    226:226:void forEachPinnedField(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):542:542 -> a
+    227:228:void lambda$forEachPinnedField$15(com.android.tools.r8.utils.InternalOptions,java.util.function.Consumer,com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.KeepFieldInfo):544:545 -> a
+    1:7:void removeKeepInfoForPrunedItems(com.android.tools.r8.graph.PrunedItems):261:267 -> b
+    8:8:boolean com.android.tools.r8.graph.PrunedItems.hasRemovedMembers():91:91 -> b
+    8:8:void removeKeepInfoForPrunedItems(com.android.tools.r8.graph.PrunedItems):267 -> b
+    9:9:void removeKeepInfoForPrunedItems(com.android.tools.r8.graph.PrunedItems):268:268 -> b
+    10:10:void keepClass(com.android.tools.r8.graph.DexProgramClass):443:443 -> b
+    11:11:void forEachPinnedMethod(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):532:532 -> b
     1:1:void forEachPinnedType(java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):522:522 -> c
-com.android.tools.r8.shaking.KeepMemberInfo -> com.android.tools.r8.shaking.G0:
+com.android.tools.r8.shaking.KeepMemberInfo -> com.android.tools.r8.shaking.K0:
     1:1:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):15:15 -> <init>
     1:3:boolean isRepackagingAllowed(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):21:23 -> a
-com.android.tools.r8.shaking.KeepMethodInfo -> com.android.tools.r8.shaking.J0:
+com.android.tools.r8.shaking.KeepMethodInfo -> com.android.tools.r8.shaking.N0:
     boolean allowMethodStaticizing -> m
     boolean allowParameterReordering -> n
     boolean allowParameterTypeStrengthening -> o
@@ -117152,10 +117969,10 @@
     2:2:boolean internalIsInliningAllowed():99:99 -> g
     2:2:boolean isInliningAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):95 -> g
     1:3:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):103:105 -> h
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():753:753 -> h
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():758:758 -> h
     4:4:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):106 -> h
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():753:753 -> h
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isMethodStaticizingEnabled():758:758 -> h
     5:5:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):106 -> h
     6:6:boolean internalIsMethodStaticizingAllowed():111:111 -> h
     6:6:boolean isMethodStaticizingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):107 -> h
@@ -117201,7 +118018,7 @@
     1:1:com.android.tools.r8.shaking.KeepMethodInfo bottom():20:20 -> z
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner newEmptyJoiner():24 -> z
     2:2:com.android.tools.r8.shaking.KeepMethodInfo$Joiner newEmptyJoiner():24:24 -> z
-com.android.tools.r8.shaking.KeepMethodInfo$Builder -> com.android.tools.r8.shaking.H0:
+com.android.tools.r8.shaking.KeepMethodInfo$Builder -> com.android.tools.r8.shaking.L0:
     boolean allowInlining -> m
     boolean allowMethodStaticizing -> n
     boolean allowParameterReordering -> o
@@ -117353,7 +118170,7 @@
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowClosedWorldReasoning():251 -> y
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder setAllowConstantArgumentOptimization(boolean):261:261 -> z
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Builder disallowConstantArgumentOptimization():270 -> z
-com.android.tools.r8.shaking.KeepMethodInfo$Joiner -> com.android.tools.r8.shaking.I0:
+com.android.tools.r8.shaking.KeepMethodInfo$Joiner -> com.android.tools.r8.shaking.M0:
     1:1:void <init>(com.android.tools.r8.shaking.KeepMethodInfo):485:485 -> <init>
     1:1:com.android.tools.r8.shaking.KeepInfo$Joiner merge(com.android.tools.r8.shaking.KeepInfo$Joiner):482:482 -> a
     2:5:com.android.tools.r8.shaking.KeepMethodInfo$Joiner merge(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):546:549 -> a
@@ -117376,13 +118193,13 @@
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowReturnTypeStrengthening():524:524 -> w
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedArgumentOptimization():529:529 -> x
     1:1:com.android.tools.r8.shaking.KeepMethodInfo$Joiner disallowUnusedReturnValueOptimization():534:534 -> y
-com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.shaking.W0:
+com.android.tools.r8.shaking.KeepReason -> com.android.tools.r8.shaking.a1:
     1:1:void <init>():19:19 -> <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 referencedInAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):67:67 -> a
     2:2:com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):83:83 -> a
-com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.shaking.K0:
+com.android.tools.r8.shaking.KeepReason$AnnotatedOn -> com.android.tools.r8.shaking.O0:
     com.android.tools.r8.graph.DexDefinition holder -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():253:253 -> <clinit>
@@ -117393,79 +118210,79 @@
     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):270 -> a
     6:9:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):271:274 -> a
-com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.shaking.L0:
+com.android.tools.r8.shaking.KeepReason$BasedOnOtherMethod -> com.android.tools.r8.shaking.P0:
     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):90:90 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):94:95 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):106:106 -> a
-com.android.tools.r8.shaking.KeepReason$InstantiatedIn -> com.android.tools.r8.shaking.M0:
+com.android.tools.r8.shaking.KeepReason$InstantiatedIn -> com.android.tools.r8.shaking.Q0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):110:110 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):113:113 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():118:118 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.shaking.N0:
+com.android.tools.r8.shaking.KeepReason$InvokedFrom -> com.android.tools.r8.shaking.R0:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():161:161 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):161:161 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):164:165 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():170:170 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.shaking.O0:
+com.android.tools.r8.shaking.KeepReason$InvokedFromLambdaCreatedIn -> com.android.tools.r8.shaking.S0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):179:179 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):182:182 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():187:187 -> a
-com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.shaking.P0:
+com.android.tools.r8.shaking.KeepReason$InvokedViaSuper -> com.android.tools.r8.shaking.T0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):127:127 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):130:130 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():135:135 -> a
-com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.shaking.Q0:
+com.android.tools.r8.shaking.KeepReason$MethodHandleReferencedFrom -> com.android.tools.r8.shaking.U0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):301:301 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):304:304 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():309:309 -> a
-com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.shaking.R0:
+com.android.tools.r8.shaking.KeepReason$ReachableFromLiveType -> com.android.tools.r8.shaking.V0:
     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):213:213 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):217:218 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():223:223 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):228:228 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.shaking.S0:
+com.android.tools.r8.shaking.KeepReason$ReferencedFrom -> com.android.tools.r8.shaking.W0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):196:196 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):199:199 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():204:204 -> a
-com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.shaking.T0:
+com.android.tools.r8.shaking.KeepReason$ReferencedInAnnotation -> com.android.tools.r8.shaking.X0:
     com.android.tools.r8.graph.DexAnnotation annotation -> a
     com.android.tools.r8.graph.ProgramDefinition annotatedItem -> b
     1:1:void <init>(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepReason$1):232:232 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.ProgramDefinition):237:239 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():244:244 -> a
     2:2:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.GraphReporter):249:249 -> a
-com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.shaking.U0:
+com.android.tools.r8.shaking.KeepReason$ReflectiveUseFrom -> com.android.tools.r8.shaking.Y0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):279:279 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):282:282 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():292:292 -> a
-com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.shaking.V0:
+com.android.tools.r8.shaking.KeepReason$TargetedBySuper -> com.android.tools.r8.shaking.Z0:
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):144:144 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):147:147 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():152:152 -> a
-com.android.tools.r8.shaking.KeepUnusedArgumentRule -> com.android.tools.r8.shaking.Y0:
+com.android.tools.r8.shaking.KeepUnusedArgumentRule -> com.android.tools.r8.shaking.c1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.KeepUnusedArgumentRule$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>
     1:1:java.lang.String typeString():81:81 -> C
-com.android.tools.r8.shaking.KeepUnusedArgumentRule$Builder -> com.android.tools.r8.shaking.X0:
+com.android.tools.r8.shaking.KeepUnusedArgumentRule$Builder -> com.android.tools.r8.shaking.b1:
     1:1:void <init>(com.android.tools.r8.shaking.KeepUnusedArgumentRule$1):14:14 -> <init>
     2:2:void <init>():18:18 -> <init>
     1:11:com.android.tools.r8.shaking.KeepUnusedArgumentRule build():28:38 -> a
     1:11:com.android.tools.r8.shaking.ProguardClassSpecification build():14 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.KeepUnusedReturnValueRule -> com.android.tools.r8.shaking.a1:
+com.android.tools.r8.shaking.KeepUnusedReturnValueRule -> com.android.tools.r8.shaking.e1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
     1:1:java.lang.String typeString():82:82 -> C
-com.android.tools.r8.shaking.KeepUnusedReturnValueRule$Builder -> com.android.tools.r8.shaking.Z0:
+com.android.tools.r8.shaking.KeepUnusedReturnValueRule$Builder -> com.android.tools.r8.shaking.d1:
     1:1:void <init>():19:19 -> <init>
     1:11:com.android.tools.r8.shaking.KeepUnusedReturnValueRule build():29:39 -> a
     1:11:com.android.tools.r8.shaking.ProguardClassSpecification build():15 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.XB:
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.dC:
     java.util.List pruned -> b
     com.android.tools.r8.utils.InternalOptions options -> a
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):26:26 -> <init>
@@ -117473,7 +118290,7 @@
     1:15:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.TypeRewriter):31:45 -> a
     16:30:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.TypeRewriter):42:56 -> a
     31:31:boolean lambda$prune$0(com.android.tools.r8.graph.DexType):50:50 -> a
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.hD:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.nD:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap escapeDebuggingCounters -> c
     java.util.Set nonEscapingClassesWithLibraryMethodOverrides -> b
@@ -117511,7 +118328,7 @@
     28:28:void logResults():173 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     29:30:void logResults():173:174 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.gD:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.mD:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():185:185 -> <clinit>
     1:1:void <init>():188:188 -> <init>
@@ -117519,9 +118336,9 @@
     2:4:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):200:202 -> 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):212:234 -> 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):201 -> a
-com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.kD:
+com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.qD:
     boolean isModeled(com.android.tools.r8.graph.DexType) -> c
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.cF:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.jF:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.function.Consumer consumer -> c
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector annotationDirectReferenceCollector -> a
@@ -117534,7 +118351,7 @@
     3:6:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer.traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):100:103 -> a
     3:6:void access$400(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):30 -> a
     7:14:void run(java.util.Set):44:51 -> a
-    15:15:boolean com.android.tools.r8.graph.DexAnnotation.hasSynthesizedClassAnnotation(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticItems):456:456 -> a
+    15:15:boolean com.android.tools.r8.graph.DexAnnotation.hasSynthesizedClassAnnotation(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticItems):483:483 -> a
     15:15:void run(java.util.Set):50 -> a
     16:16:void run(java.util.Set):52:52 -> a
     17:17:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer.traceAnnotationsDirectDependencies(com.android.tools.r8.graph.DexAnnotationSet):96:96 -> a
@@ -117565,7 +118382,7 @@
     32:45:com.android.tools.r8.graph.DexProgramClass getFirstReferenceOutsideFromCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,java.util.function.Predicate):79:92 -> a
     46:50:void lambda$getFirstReferenceOutsideFromCode$2(com.android.tools.r8.graph.AppView,java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexType):83:87 -> a
     1:1:java.util.function.Consumer access$300(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):30:30 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.aF:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.hF:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):189:189 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):189:189 -> <init>
@@ -117577,7 +118394,7 @@
     9:9:boolean addType(com.android.tools.r8.graph.DexType):227:227 -> a
     10:10:boolean addCallSite(com.android.tools.r8.graph.DexCallSite):233:233 -> a
     11:11:boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle):238:238 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.bF:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.iF:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> e
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):107:107 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.ProgramMethod):109:110 -> <init>
@@ -117603,7 +118420,7 @@
     1:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):120 -> g
     3:4:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector.registerFieldAccess(com.android.tools.r8.graph.DexField):169:170 -> g
     3:4:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):165 -> g
-com.android.tools.r8.shaking.MainDexInfo -> com.android.tools.r8.shaking.c1:
+com.android.tools.r8.shaking.MainDexInfo -> com.android.tools.r8.shaking.g1:
     java.util.Set tracedMethodRoots -> c
     com.android.tools.r8.shaking.MainDexInfo NONE -> f
     java.util.Set tracedDependencies -> d
@@ -117638,7 +118455,7 @@
     14:15:boolean isTracedMethodRoot(com.android.tools.r8.graph.DexMethod):103:104 -> a
     16:25:boolean isContainedOrHasContainedContext(com.android.tools.r8.graph.DexReference,java.util.Set,com.android.tools.r8.synthesis.SyntheticItems):113:122 -> a
     26:26:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):166:166 -> a
-    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    27:27:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     27:27:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):166 -> a
     28:35:boolean canMerge(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexReference,com.android.tools.r8.synthesis.SyntheticItems):170:177 -> a
     28:35:boolean canMerge(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):166 -> a
@@ -117708,7 +118525,7 @@
     1:1:boolean isTracedMethodRootsCleared():134:134 -> e
     1:1:com.android.tools.r8.shaking.MainDexInfo none():232:232 -> f
     1:1:int size():236:236 -> g
-com.android.tools.r8.shaking.MainDexInfo$Builder -> com.android.tools.r8.shaking.b1:
+com.android.tools.r8.shaking.MainDexInfo$Builder -> com.android.tools.r8.shaking.f1:
     java.util.Set methodRoots -> c
     java.util.Set dependencies -> d
     boolean tracedMethodRootsCleared -> e
@@ -117742,14 +118559,14 @@
     1:1:boolean contains(com.android.tools.r8.graph.DexType):384 -> e
     2:2:boolean isDependency(com.android.tools.r8.graph.DexType):376:376 -> e
     2:2:boolean contains(com.android.tools.r8.graph.DexType):384 -> e
-com.android.tools.r8.shaking.MainDexInfo$MainDexGroup -> com.android.tools.r8.internal.dF:
+com.android.tools.r8.shaking.MainDexInfo$MainDexGroup -> com.android.tools.r8.internal.kF:
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_DEPENDENCY -> d
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup NOT_IN_MAIN_DEX -> e
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_LIST -> b
     com.android.tools.r8.shaking.MainDexInfo$MainDexGroup MAIN_DEX_ROOT -> c
     1:4:void <clinit>():38:41 -> <clinit>
     1:1:void <init>(java.lang.String,int):37:37 -> <init>
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.eF:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.lF:
     java.util.Map annotationTypeContainEnum -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.MainDexInfo$Builder mainDexInfoBuilder -> d
@@ -117826,9 +118643,9 @@
     26:26:void com.android.tools.r8.shaking.MainDexListBuilder.addAnnotationsWithEnum(com.android.tools.r8.graph.DexProgramClass):173:173 -> c
     26:26:void traceRuntimeAnnotationsWithEnumForMainDex():80 -> c
     27:27:void traceRuntimeAnnotationsWithEnumForMainDex():86:86 -> c
-    28:34:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):327:333 -> c
+    28:34:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):332:338 -> c
     28:34:void traceRuntimeAnnotationsWithEnumForMainDex():86 -> c
-com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.shaking.e1:
+com.android.tools.r8.shaking.MemberValuePropagationRule -> com.android.tools.r8.shaking.i1:
     com.android.tools.r8.shaking.MemberValuePropagationRule$Type type -> r
     int $r8$clinit -> s
     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>
@@ -117841,17 +118658,17 @@
     113:113:java.lang.String typeString():104:104 -> C
     110:110:java.lang.String typeString():104:104 -> C
     1:1:com.android.tools.r8.shaking.MemberValuePropagationRule$Type getType():95:95 -> D
-com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.shaking.d1:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Builder -> com.android.tools.r8.shaking.h1:
     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() -> e
-com.android.tools.r8.shaking.MemberValuePropagationRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.UF:
+com.android.tools.r8.shaking.MemberValuePropagationRule$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.bG:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     java.lang.String stringValueOf(int) -> a
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.shaking.MinimumKeepInfoCollection -> com.android.tools.r8.internal.TG:
+com.android.tools.r8.shaking.MinimumKeepInfoCollection -> com.android.tools.r8.internal.aH:
     java.util.Map minimumKeepInfo -> a
     com.android.tools.r8.shaking.MinimumKeepInfoCollection EMPTY -> b
     boolean $assertionsDisabled -> c
@@ -117909,7 +118726,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$getOrCreateMinimumKeepInfoFor$5(com.android.tools.r8.graph.DexReference):100:100 -> b
     2:2:boolean isEmpty():110:110 -> b
-com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.internal.XG:
+com.android.tools.r8.shaking.MissingClasses -> com.android.tools.r8.internal.eH:
     java.util.Set missingClasses -> a
     1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.MissingClasses$1):37:37 -> <init>
     2:3:void <init>(java.util.Set):41:42 -> <init>
@@ -117917,7 +118734,7 @@
     2:2:void forEach(java.util.function.Consumer):54:54 -> a
     3:3:boolean contains(com.android.tools.r8.graph.DexType):58:58 -> a
     1:1:com.android.tools.r8.shaking.MissingClasses empty():50:50 -> b
-com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.internal.WG:
+com.android.tools.r8.shaking.MissingClasses$Builder -> com.android.tools.r8.internal.dH:
     java.util.Map newMissingClasses -> b
     java.util.Set newIgnoredMissingClasses -> c
     java.util.Set alreadyMissingClasses -> a
@@ -117988,14 +118805,14 @@
     123:126:void com.android.tools.r8.shaking.MissingClasses$Builder.addWithRewrittenType(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):300:303 -> a
     123:126:void lambda$getAllowedMissingClasses$7(com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.CustomConversionDescriptor):292 -> a
     127:128:boolean lambda$getIsCompilerSynthesizedAllowedMissingClassesPredicate$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):312:313 -> a
-    129:129:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):444:444 -> a
+    129:129:boolean com.android.tools.r8.graph.DexString.startsWith(com.android.tools.r8.graph.DexString):448:448 -> a
     129:129:boolean lambda$getIsCompilerSynthesizedAllowedMissingClassesPredicate$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):313 -> a
     1:1:void ignoreNewMissingClass(com.android.tools.r8.graph.DexType):110:110 -> b
     2:5:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):135:138 -> b
-    6:6:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> b
+    6:6:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> b
     6:6:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):139 -> b
     7:7:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):139:139 -> b
-    8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> b
+    8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> b
     8:8:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):141 -> b
     9:9:com.android.tools.r8.shaking.MissingClasses reportMissingClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle):141:141 -> b
     10:12:com.android.tools.r8.shaking.MissingClasses com.android.tools.r8.shaking.MissingClasses$Builder.build():331:333 -> b
@@ -118007,83 +118824,83 @@
     2:6:java.util.function.Predicate getIsAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):262:266 -> c
     1:3:java.util.function.Predicate getIsCompilerSynthesizedAllowedMissingClassesPredicate(com.android.tools.r8.graph.AppView):309:311 -> d
     4:4:boolean wasAlreadyMissing(com.android.tools.r8.graph.DexType):337:337 -> d
-com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule -> com.android.tools.r8.shaking.g1:
+com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule -> com.android.tools.r8.shaking.k1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$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>
     1:1:java.lang.String typeString():82:82 -> C
-com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.f1:
+com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.j1:
     1:1:void <init>(com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$1):15:15 -> <init>
     2:2:void <init>():19:19 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.NoHorizontalClassMergingRule -> com.android.tools.r8.shaking.i1:
+com.android.tools.r8.shaking.NoHorizontalClassMergingRule -> com.android.tools.r8.shaking.m1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.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>
     1:1:java.lang.String typeString():82:82 -> C
-com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder -> com.android.tools.r8.shaking.h1:
+com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder -> com.android.tools.r8.shaking.l1:
     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() -> e
-com.android.tools.r8.shaking.NoMethodStaticizingRule -> com.android.tools.r8.shaking.k1:
+com.android.tools.r8.shaking.NoMethodStaticizingRule -> com.android.tools.r8.shaking.o1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
     1:1:java.lang.String typeString():82:82 -> C
-com.android.tools.r8.shaking.NoMethodStaticizingRule$Builder -> com.android.tools.r8.shaking.j1:
+com.android.tools.r8.shaking.NoMethodStaticizingRule$Builder -> com.android.tools.r8.shaking.n1:
     1:1:void <init>():19:19 -> <init>
     1:11:com.android.tools.r8.shaking.NoMethodStaticizingRule build():29:39 -> a
     1:11:com.android.tools.r8.shaking.ProguardClassSpecification build():15 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.NoOptimizationBaseRule -> com.android.tools.r8.shaking.m1:
+com.android.tools.r8.shaking.NoOptimizationBaseRule -> com.android.tools.r8.shaking.q1:
     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):36:36 -> <init>
-com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder -> com.android.tools.r8.shaking.l1:
+com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder -> com.android.tools.r8.shaking.p1:
     1:1:void <init>():18:18 -> <init>
-com.android.tools.r8.shaking.NoParameterReorderingRule -> com.android.tools.r8.shaking.o1:
+com.android.tools.r8.shaking.NoParameterReorderingRule -> com.android.tools.r8.shaking.s1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):60:60 -> <init>
     1:1:java.lang.String typeString():82:82 -> C
-com.android.tools.r8.shaking.NoParameterReorderingRule$Builder -> com.android.tools.r8.shaking.n1:
+com.android.tools.r8.shaking.NoParameterReorderingRule$Builder -> com.android.tools.r8.shaking.r1:
     1:1:void <init>():19:19 -> <init>
     1:11:com.android.tools.r8.shaking.NoParameterReorderingRule build():29:39 -> a
     1:11:com.android.tools.r8.shaking.ProguardClassSpecification build():15 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule -> com.android.tools.r8.shaking.q1:
+com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule -> com.android.tools.r8.shaking.u1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
     1:1:java.lang.String typeString():83:83 -> C
-com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.p1:
+com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.t1:
     1:1:void <init>():20:20 -> <init>
     1:11:com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule build():30:40 -> a
     1:11:com.android.tools.r8.shaking.ProguardClassSpecification build():16 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule -> com.android.tools.r8.shaking.s1:
+com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule -> com.android.tools.r8.shaking.w1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):61:61 -> <init>
     1:1:java.lang.String typeString():83:83 -> C
-com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.r1:
+com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule$Builder -> com.android.tools.r8.shaking.v1:
     1:1:void <init>():20:20 -> <init>
     1:11:com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule build():30:40 -> a
     1:11:com.android.tools.r8.shaking.ProguardClassSpecification build():16 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule -> com.android.tools.r8.shaking.u1:
+com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule -> com.android.tools.r8.shaking.y1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.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>
     1:1:java.lang.String typeString():81:81 -> C
-com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder -> com.android.tools.r8.shaking.t1:
+com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder -> com.android.tools.r8.shaking.x1:
     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() -> e
-com.android.tools.r8.shaking.NoVerticalClassMergingRule -> com.android.tools.r8.shaking.w1:
+com.android.tools.r8.shaking.NoVerticalClassMergingRule -> com.android.tools.r8.shaking.A1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.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>
     1:1:java.lang.String typeString():81:81 -> C
-com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder -> com.android.tools.r8.shaking.v1:
+com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder -> com.android.tools.r8.shaking.z1:
     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() -> e
-com.android.tools.r8.shaking.ObjectAllocationInfoCollectionUtils -> com.android.tools.r8.internal.JL:
+com.android.tools.r8.shaking.ObjectAllocationInfoCollectionUtils -> com.android.tools.r8.internal.aM:
     1:8:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ObjectAllocationInfoCollection):28:35 -> a
     9:13:boolean com.android.tools.r8.shaking.ObjectAllocationInfoCollectionUtils.mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ObjectAllocationInfoCollection):43:47 -> a
     9:13:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ObjectAllocationInfoCollection):34 -> a
@@ -118094,96 +118911,99 @@
     68:75:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$1(com.android.tools.r8.graph.ObjectAllocationInfoCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):59:66 -> a
     76:83:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$1(com.android.tools.r8.graph.ObjectAllocationInfoCollection,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):65:72 -> a
     84:84:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$2(com.android.tools.r8.ir.desugar.LambdaDescriptor):76:76 -> a
-com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.qP:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.IP:
     java.util.List NAMES -> c
     int PPP_MASK -> b
     int flags -> a
     1:1:void <clinit>():15:15 -> <clinit>
-    2:2:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardAccessFlags.setPublic():81:81 -> <clinit>
+    2:2:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardAccessFlags.setPublic():83:83 -> <clinit>
     2:2:void <clinit>():16 -> <clinit>
-    3:3:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardAccessFlags.setProtected():99:99 -> <clinit>
+    3:3:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardAccessFlags.setProtected():101:101 -> <clinit>
     3:3:void <clinit>():16 -> <clinit>
-    4:4:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardAccessFlags.setPrivate():90:90 -> <clinit>
+    4:4:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardAccessFlags.setPrivate():92:92 -> <clinit>
     4:4:void <clinit>():16 -> <clinit>
-    5:10:void <clinit>():16:21 -> <clinit>
+    5:11:void <clinit>():16:22 -> <clinit>
     1:6:void <init>():13:18 -> <init>
-    1:1:void setVolatile():142:142 -> A
-    1:1:java.util.List getPredicates():39:39 -> a
-    2:2:boolean containsAll(com.android.tools.r8.graph.AccessFlags):69:69 -> a
-    3:3:boolean com.android.tools.r8.shaking.ProguardAccessFlags.containsAll(int):57:57 -> a
-    3:3:boolean containsAll(com.android.tools.r8.graph.AccessFlags):69 -> a
-    4:4:boolean isSet(int):198:198 -> a
-    1:1:boolean containsNone(com.android.tools.r8.graph.AccessFlags):73:73 -> b
-    2:2:boolean com.android.tools.r8.shaking.ProguardAccessFlags.containsNone(int):65:65 -> b
-    2:2:boolean containsNone(com.android.tools.r8.graph.AccessFlags):73 -> b
-    3:3:boolean isAbstract():138:138 -> b
-    4:4:void set(int):202:202 -> b
-    1:1:boolean isBridge():194:194 -> c
-    1:1:boolean isFinal():130:130 -> d
-    1:1:boolean isNative():170:170 -> e
-    1:4:boolean equals(java.lang.Object):225:228 -> equals
-    1:1:boolean isPrivate():95:95 -> f
-    1:1:boolean isProtected():104:104 -> g
-    1:1:boolean isPublic():86:86 -> h
-    1:1:int hashCode():233:233 -> hashCode
-    1:1:boolean isStatic():122:122 -> i
-    1:1:boolean isStrict():178:178 -> j
-    1:1:boolean isSynchronized():162:162 -> k
-    1:1:boolean isSynthetic():186:186 -> l
-    1:1:boolean isTransient():154:154 -> m
-    1:1:boolean isVolatile():146:146 -> n
-    1:1:void setAbstract():134:134 -> o
-    1:1:void setBridge():190:190 -> p
-    1:1:void setFinal():126:126 -> q
-    1:1:void setNative():166:166 -> r
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setPrivate():90:90 -> s
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setProtected():99:99 -> t
-    1:14:java.lang.String toString():207:220 -> toString
-    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setPublic():81:81 -> u
-    1:1:void setStatic():118:118 -> v
-    1:1:void setStrict():174:174 -> w
-    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.y1:
+    1:1:void setSynthetic():184:184 -> A
+    1:1:void setTransient():152:152 -> B
+    1:1:void setVolatile():144:144 -> C
+    1:1:java.util.List getPredicates():40:40 -> a
+    2:2:boolean containsAll(com.android.tools.r8.graph.AccessFlags):71:71 -> a
+    3:3:boolean com.android.tools.r8.shaking.ProguardAccessFlags.containsAll(int):59:59 -> a
+    3:3:boolean containsAll(com.android.tools.r8.graph.AccessFlags):71 -> a
+    4:4:boolean isSet(int):208:208 -> a
+    1:1:boolean containsNone(com.android.tools.r8.graph.AccessFlags):75:75 -> b
+    2:2:boolean com.android.tools.r8.shaking.ProguardAccessFlags.containsNone(int):67:67 -> b
+    2:2:boolean containsNone(com.android.tools.r8.graph.AccessFlags):75 -> b
+    3:3:boolean isAbstract():140:140 -> b
+    4:4:void set(int):212:212 -> b
+    1:1:boolean isBridge():196:196 -> c
+    1:1:boolean isConstructor():204:204 -> d
+    1:1:boolean isFinal():132:132 -> e
+    1:4:boolean equals(java.lang.Object):235:238 -> equals
+    1:1:boolean isNative():172:172 -> f
+    1:1:boolean isPrivate():97:97 -> g
+    1:1:boolean isProtected():106:106 -> h
+    1:1:int hashCode():243:243 -> hashCode
+    1:1:boolean isPublic():88:88 -> i
+    1:1:boolean isStatic():124:124 -> j
+    1:1:boolean isStrict():180:180 -> k
+    1:1:boolean isSynchronized():164:164 -> l
+    1:1:boolean isSynthetic():188:188 -> m
+    1:1:boolean isTransient():156:156 -> n
+    1:1:boolean isVolatile():148:148 -> o
+    1:1:void setAbstract():136:136 -> p
+    1:1:void setBridge():192:192 -> q
+    1:1:void setConstructor():200:200 -> r
+    1:1:void setFinal():128:128 -> s
+    1:1:void setNative():168:168 -> t
+    1:14:java.lang.String toString():217:230 -> toString
+    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setPrivate():92:92 -> u
+    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setProtected():101:101 -> v
+    1:1:com.android.tools.r8.shaking.ProguardAccessFlags setPublic():83:83 -> w
+    1:1:void setStatic():120:120 -> x
+    1:1:void setStrict():176:176 -> y
+    1:1:void setSynchronized():160:160 -> z
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.shaking.C1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.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>
     1:1:java.lang.String typeString():85:85 -> C
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.shaking.x1:
+    boolean applyToNonProgramClasses() -> p
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.shaking.B1:
     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() -> e
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.shaking.A1:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.shaking.E1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.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>
     1:1:java.lang.String typeString():87:87 -> C
     boolean applyToNonProgramClasses() -> p
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.shaking.z1:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.shaking.D1:
     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() -> e
-com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.shaking.C1:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.shaking.G1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.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>
     1:1:java.lang.String typeString():82:82 -> C
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.shaking.B1:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.shaking.F1:
     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() -> e
-com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.shaking.E1:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.shaking.I1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.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>
     1:1:java.lang.String typeString():89:89 -> C
     com.android.tools.r8.shaking.ProguardCheckDiscardRule asProguardCheckDiscardRule() -> r
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.shaking.D1:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.shaking.H1:
     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() -> e
-com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.shaking.F1:
+com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.shaking.J1:
     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>
@@ -118192,14 +119012,14 @@
     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$Builder -> com.android.tools.r8.shaking.F1$a:
+com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.shaking.J1$a:
     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.G1:
+com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.shaking.K1:
     1:1:void <init>():24:24 -> <init>
     java.util.List asSpecificDexTypes() -> a
     boolean matches(com.android.tools.r8.graph.DexType) -> a
@@ -118212,14 +119032,14 @@
     1:1:boolean hasWildcards():94:94 -> d
     int size() -> e
     1:3:java.lang.String toString():74:76 -> toString
-com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.shaking.G1$a:
+com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.shaking.K1$a:
     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.H1:
+com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.shaking.L1:
     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>
@@ -118233,7 +119053,7 @@
     1:1:int size():344:344 -> e
     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.I1:
+com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.shaking.M1:
     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>
@@ -118250,7 +119070,7 @@
     1:1:int size():255:255 -> e
     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.G1$b:
+com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.shaking.K1$b:
     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>
@@ -118263,7 +119083,7 @@
     int size() -> e
     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.J1:
+com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.shaking.N1:
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceClassName -> k
     boolean $assertionsDisabled -> n
     com.android.tools.r8.shaking.ProguardClassType classType -> h
@@ -118307,7 +119127,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.J1$a:
+com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.shaking.N1$a:
     com.android.tools.r8.shaking.ProguardClassType classType -> i
     boolean inheritanceIsExtends -> m
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceClassName -> l
@@ -118338,7 +119158,7 @@
     3:3:java.util.List buildInheritanceAnnotations():120:120 -> c
     1:7:com.android.tools.r8.position.Position getPosition():73:79 -> d
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.xP:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.PP:
     com.android.tools.r8.shaking.ProguardClassType ANNOTATION_INTERFACE -> b
     com.android.tools.r8.shaking.ProguardClassType INTERFACE -> e
     com.android.tools.r8.shaking.ProguardClassType UNSPECIFIED -> f
@@ -118357,25 +119177,25 @@
     12:12:java.lang.String toString():46:46 -> toString
     13:13:java.lang.String toString():45:45 -> toString
     14:14:java.lang.String toString():44:44 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.rP:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.JP:
     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.sP:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.internal.KP:
     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.tP:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.internal.LP:
     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.uP:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.internal.MP:
     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.vP:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.internal.NP:
     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.wP:
+com.android.tools.r8.shaking.ProguardClassType$6 -> com.android.tools.r8.internal.OP:
     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.internal.zP:
+com.android.tools.r8.shaking.ProguardCompatibilityActions -> com.android.tools.r8.internal.RP:
     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>
@@ -118395,7 +119215,7 @@
     53:53:com.android.tools.r8.shaking.ProguardCompatibilityActions withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):31 -> a
     54:59:com.android.tools.r8.shaking.ProguardCompatibilityActions withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):32:37 -> a
     60:60:boolean isCompatInstantiated(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
-com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder -> com.android.tools.r8.internal.yP:
+com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder -> com.android.tools.r8.internal.QP:
     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
@@ -118407,7 +119227,7 @@
     4:4:void com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder.addCompatInstantiatedType(com.android.tools.r8.graph.DexType):57:57 -> a
     4:4:void access$000(com.android.tools.r8.shaking.ProguardCompatibilityActions$Builder,com.android.tools.r8.graph.DexType):48 -> a
     5:5:com.android.tools.r8.shaking.ProguardCompatibilityActions build():61:61 -> a
-com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.shaking.K1:
+com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.shaking.O1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String packagePrefix -> f
     boolean optimizing -> i
@@ -118449,58 +119269,58 @@
     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.ProguardConfiguration$1):20:20 -> <init>
-    2:42: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):449:489 -> <init>
-    1:1:boolean hasDontWarnPatterns():593:593 -> A
-    1:1:boolean isAccessModificationAllowed():525:525 -> B
-    1:1:boolean isConfigurationDebugging():654:654 -> C
-    1:1:boolean isIgnoreWarnings():545:545 -> D
-    1:1:boolean isKeepParameterNames():626:626 -> E
-    1:1:boolean isObfuscating():553:553 -> F
-    1:1:boolean isOptimizing():549:549 -> G
-    1:1:boolean isOverloadAggressively():610:610 -> H
-    1:1:boolean isPrintConfiguration():561:561 -> I
-    1:1:boolean isPrintMapping():529:529 -> J
-    1:1:boolean isPrintSeeds():646:646 -> K
-    1:1:boolean isPrintUsage():569:569 -> L
-    1:1:boolean isProtoShrinkingEnabled():662:662 -> M
-    1:1:boolean isShrinking():557:557 -> N
-    1:1:boolean isVerbose():577:577 -> O
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):497:497 -> a
-    2:2:com.android.tools.r8.shaking.ProguardClassFilter getDontWarnPatterns(com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness):598:598 -> a
-    3:3:com.android.tools.r8.shaking.ProguardClassFilter getAdaptClassStrings():630:630 -> a
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFileContents():638:638 -> b
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFilenames():634:634 -> c
-    1:1:java.nio.file.Path getApplyMappingFile():541:541 -> d
-    1:1:java.util.List getClassObfuscationDictionary():618:618 -> e
-    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():505:505 -> f
-    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontNotePatterns():602:602 -> g
-    1:1:java.util.List getInjars():509:509 -> h
-    1:1:com.android.tools.r8.shaking.ProguardKeepAttributes getKeepAttributes():585:585 -> i
-    1:1:com.android.tools.r8.shaking.ProguardPathFilter getKeepDirectories():642:642 -> j
-    1:1:com.android.tools.r8.shaking.ProguardPackageNameList getKeepPackageNamesPatterns():589:589 -> k
-    1:1:java.util.List getLibraryjars():513:513 -> l
-    1:1:int getMaxRemovedAndroidLogLevel():666:666 -> m
-    1:1:java.util.List getObfuscationDictionary():614:614 -> n
-    1:1:java.util.List getPackageObfuscationDictionary():622:622 -> o
-    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():517:517 -> p
-    1:1:java.lang.String getPackagePrefix():521:521 -> q
-    1:1:java.lang.String getParsedConfiguration():501:501 -> r
-    1:1:java.nio.file.Path getPrintConfigurationFile():565:565 -> s
-    1:1:java.nio.file.Path getPrintMappingFile():533:533 -> t
-    1:2:java.lang.String toString():671:672 -> toString
+    2:42: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):458:498 -> <init>
+    1:1:boolean hasDontWarnPatterns():602:602 -> A
+    1:1:boolean isAccessModificationAllowed():534:534 -> B
+    1:1:boolean isConfigurationDebugging():663:663 -> C
+    1:1:boolean isIgnoreWarnings():554:554 -> D
+    1:1:boolean isKeepParameterNames():635:635 -> E
+    1:1:boolean isObfuscating():562:562 -> F
+    1:1:boolean isOptimizing():558:558 -> G
+    1:1:boolean isOverloadAggressively():619:619 -> H
+    1:1:boolean isPrintConfiguration():570:570 -> I
+    1:1:boolean isPrintMapping():538:538 -> J
+    1:1:boolean isPrintSeeds():655:655 -> K
+    1:1:boolean isPrintUsage():578:578 -> L
+    1:1:boolean isProtoShrinkingEnabled():671:671 -> M
+    1:1:boolean isShrinking():566:566 -> N
+    1:1:boolean isVerbose():586:586 -> O
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder builder(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):506:506 -> a
+    2:2:com.android.tools.r8.shaking.ProguardClassFilter getDontWarnPatterns(com.android.tools.r8.errors.dontwarn.DontWarnConfiguration$Witness):607:607 -> a
+    3:3:com.android.tools.r8.shaking.ProguardClassFilter getAdaptClassStrings():639:639 -> a
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFileContents():647:647 -> b
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getAdaptResourceFilenames():643:643 -> c
+    1:1:java.nio.file.Path getApplyMappingFile():550:550 -> d
+    1:1:java.util.List getClassObfuscationDictionary():627:627 -> e
+    1:1:com.android.tools.r8.graph.DexItemFactory getDexItemFactory():514:514 -> f
+    1:1:com.android.tools.r8.shaking.ProguardClassFilter getDontNotePatterns():611:611 -> g
+    1:1:java.util.List getInjars():518:518 -> h
+    1:1:com.android.tools.r8.shaking.ProguardKeepAttributes getKeepAttributes():594:594 -> i
+    1:1:com.android.tools.r8.shaking.ProguardPathFilter getKeepDirectories():651:651 -> j
+    1:1:com.android.tools.r8.shaking.ProguardPackageNameList getKeepPackageNamesPatterns():598:598 -> k
+    1:1:java.util.List getLibraryjars():522:522 -> l
+    1:1:int getMaxRemovedAndroidLogLevel():675:675 -> m
+    1:1:java.util.List getObfuscationDictionary():623:623 -> n
+    1:1:java.util.List getPackageObfuscationDictionary():631:631 -> o
+    1:1:com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode getPackageObfuscationMode():526:526 -> p
+    1:1:java.lang.String getPackagePrefix():530:530 -> q
+    1:1:java.lang.String getParsedConfiguration():510:510 -> r
+    1:1:java.nio.file.Path getPrintConfigurationFile():574:574 -> s
+    1:1:java.nio.file.Path getPrintMappingFile():542:542 -> t
+    1:2:java.lang.String toString():680:681 -> toString
     3:3:boolean com.android.tools.r8.shaking.ProguardKeepAttributes.isEmpty():216:216 -> toString
-    3:3:java.lang.String toString():672 -> toString
+    3:3:java.lang.String toString():681 -> toString
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean com.android.tools.r8.shaking.ProguardKeepAttributes.isEmpty():216:216 -> toString
-    4:4:java.lang.String toString():672 -> toString
-    5:12:java.lang.String toString():673:680 -> toString
-    1:1:java.nio.file.Path getPrintUsageFile():573:573 -> u
-    1:1:java.lang.String getRenameSourceFileAttribute():581:581 -> v
-    1:1:java.util.List getRules():606:606 -> w
-    1:1:java.nio.file.Path getSeedFile():650:650 -> x
-    1:1:boolean hasApplyMappingFile():537:537 -> y
-    1:1:boolean hasDontUseMixedCaseClassnames():658:658 -> z
-com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.shaking.K1$a:
+    4:4:java.lang.String toString():681 -> toString
+    5:12:java.lang.String toString():682:689 -> toString
+    1:1:java.nio.file.Path getPrintUsageFile():582:582 -> u
+    1:1:java.lang.String getRenameSourceFileAttribute():590:590 -> v
+    1:1:java.util.List getRules():615:615 -> w
+    1:1:java.nio.file.Path getSeedFile():659:659 -> x
+    1:1:boolean hasApplyMappingFile():546:546 -> y
+    1:1:boolean hasDontUseMixedCaseClassnames():667:667 -> z
+com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.shaking.O1$a:
     java.lang.String packagePrefix -> f
     java.nio.file.Path classObfuscationDictionary -> D
     boolean overloadAggressively -> N
@@ -118560,18 +119380,21 @@
     11:11:void addAdaptClassStringsPattern(com.android.tools.r8.shaking.ProguardClassNameList):253:253 -> a
     12:12:void addAdaptResourceFileContents(com.android.tools.r8.shaking.ProguardPathList):262:262 -> a
     13:13:void setForceProguardCompatibility(boolean):274:274 -> a
-    14:14:void setMaxRemovedAndroidLogLevel(int):302:302 -> a
-    15:15:com.android.tools.r8.shaking.ProguardConfiguration build():355:355 -> a
-    16:16:boolean isObfuscating():129:129 -> a
-    16:16:com.android.tools.r8.shaking.ProguardConfiguration build():355 -> a
-    17:24:com.android.tools.r8.shaking.ProguardConfiguration build():357:364 -> a
+    14:21:void joinMaxRemovedAndroidLogLevel(int):303:310 -> a
+    22:22:com.android.tools.r8.shaking.ProguardConfiguration build():364:364 -> a
+    23:23:boolean isObfuscating():129:129 -> a
+    23:23:com.android.tools.r8.shaking.ProguardConfiguration build():364 -> a
+    24:31:com.android.tools.r8.shaking.ProguardConfiguration build():366:373 -> a
     1:1:void addLibraryJars(java.util.List):89:89 -> b
     2:3:void setFlattenPackagePrefix(java.lang.String):102:103 -> b
     4:4:void setIgnoreWarnings(boolean):111:111 -> b
     5:5:void addDontNotePattern(com.android.tools.r8.shaking.ProguardClassNameList):205:205 -> b
     6:6:void setClassObfuscationDictionary(java.nio.file.Path):221:221 -> b
     7:7:com.android.tools.r8.shaking.ProguardConfiguration$Builder addAdaptResourceFilenames(com.android.tools.r8.shaking.ProguardPathList):257:257 -> b
-    8:51:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():306:349 -> b
+    8:45:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():315:352 -> b
+    46:47:int getMaxRemovedAndroidLogLevelOrDefault(int):298:299 -> b
+    46:47:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():356 -> b
+    48:50:com.android.tools.r8.shaking.ProguardConfiguration buildRaw():356:358 -> b
     1:2:void setPackagePrefix(java.lang.String):97:98 -> c
     3:3:com.android.tools.r8.shaking.ProguardConfiguration$Builder disableObfuscation():120:120 -> c
     4:4:void addDontWarnPattern(com.android.tools.r8.shaking.ProguardClassNameList):201:201 -> c
@@ -118603,88 +119426,88 @@
     1:1:void setPrintConfiguration(boolean):146:146 -> r
     1:1:void setPrintUsage(boolean):155:155 -> s
     1:1:void setVerbose(boolean):180:180 -> t
-com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.shaking.M1:
+com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.shaking.Q1:
     com.android.tools.r8.shaking.ProguardConfiguration$Builder configurationBuilder -> a
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
-    java.util.List UNSUPPORTED_FLAG_OPTIONS -> o
-    com.android.tools.r8.InputDependencyGraphConsumer inputDependencyConsumer -> d
-    com.android.tools.r8.utils.Reporter reporter -> c
+    int $r8$clinit -> o
+    com.android.tools.r8.utils.Reporter reporter -> d
+    com.android.tools.r8.InputDependencyGraphConsumer inputDependencyConsumer -> e
+    com.android.tools.r8.shaking.ProguardConfigurationParserOptions options -> c
     java.util.List IGNORED_SINGLE_ARG_OPTIONS -> f
-    boolean allowTestOptions -> e
-    java.util.List IGNORED_RETURN_VALUE_ATTRIBUTES -> j
+    java.util.List WARNED_SINGLE_ARG_OPTIONS -> j
     java.util.List IGNORED_CLASS_DESCRIPTOR_OPTIONS -> i
     java.util.List IGNORED_FLAG_OPTIONS -> h
     java.util.List IGNORED_OPTIONAL_SINGLE_ARG_OPTIONS -> g
-    java.util.List WARNED_CLASS_DESCRIPTOR_OPTIONS -> n
-    java.util.List WARNED_FLAG_OPTIONS -> m
-    java.util.List WARNED_OPTIONAL_SINGLE_ARG_OPTIONS -> l
-    int $r8$clinit -> p
-    java.util.List WARNED_SINGLE_ARG_OPTIONS -> k
-    1:52:void <clinit>():60:111 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):125:125 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.InputDependencyGraphConsumer,boolean):132:141 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder access$000(com.android.tools.r8.shaking.ProguardConfigurationParser):47:47 -> a
-    2:2:java.util.List access$1000():47:47 -> a
-    3:3:void parse(java.nio.file.Path):205:205 -> a
-    4:4:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):209:209 -> a
-    5:12:void parse(java.util.List):213:220 -> a
-    13:13:void parse(java.util.List):217:217 -> a
+    java.util.List UNSUPPORTED_FLAG_OPTIONS -> n
+    java.util.List WARNED_CLASS_DESCRIPTOR_OPTIONS -> m
+    java.util.List WARNED_FLAG_OPTIONS -> l
+    java.util.List WARNED_OPTIONAL_SINGLE_ARG_OPTIONS -> k
+    1:51:void <clinit>():57:107 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):124:129 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):121:121 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfigurationParserOptions):136:136 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,com.android.tools.r8.shaking.ProguardConfigurationParserOptions,com.android.tools.r8.InputDependencyGraphConsumer):143:151 -> <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:3:void parse(java.nio.file.Path):215:215 -> a
+    4:4:void parse(com.android.tools.r8.shaking.ProguardConfigurationSource):219:219 -> a
+    5:12:void parse(java.util.List):223:230 -> a
+    13:13:void parse(java.util.List):227:227 -> a
     14:14:void parse(java.util.List):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":240,"2":241,"3":242}}
-    240:240:void parse(java.util.List):217:217 -> a
-    241:241:void parse(java.util.List):217:217 -> a
-    242:242:void parse(java.util.List):217:217 -> a
-    231:233:void parse(java.util.List):217:217 -> a
-    239:239:void parse(java.util.List):223:223 -> a
-    1:1:com.android.tools.r8.utils.Reporter access$100(com.android.tools.r8.shaking.ProguardConfigurationParser):47:47 -> b
-    2:2:java.util.List access$1100():47:47 -> b
-    1:1:java.util.List access$1200():47:47 -> c
-    2:2:com.android.tools.r8.graph.DexItemFactory access$1400(com.android.tools.r8.shaking.ProguardConfigurationParser):47:47 -> c
-    1:1:java.util.List access$1300():47:47 -> d
-    2:2:com.android.tools.r8.InputDependencyGraphConsumer access$200(com.android.tools.r8.shaking.ProguardConfigurationParser):47:47 -> d
-    1:1:boolean access$300(com.android.tools.r8.shaking.ProguardConfigurationParser):47:47 -> e
-    2:2:java.util.List access$400():47:47 -> e
-    1:1:java.util.List access$500():47:47 -> f
-    1:1:java.util.List access$600():47:47 -> g
-    1:1:java.util.List access$700():47:47 -> h
-    1:1:java.util.List access$800():47:47 -> i
-    1:1:java.util.List access$900():47:47 -> j
-    1:1:com.android.tools.r8.InputDependencyGraphConsumer emptyInputDependencyGraphConsumer():145:145 -> k
-    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfig():191:192 -> l
-    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfigRawForTesting():200:201 -> m
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():159:159 -> n
-    1:7:void validate():163:169 -> o
-    8:16:void validate():166:174 -> o
-    17:17:void validate():0:0 -> o
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":380,"2":381,"3":382,"4":383,"5":384}}
-    380:380:void validate():174:174 -> o
-    381:381:void validate():174:174 -> o
-    382:382:void validate():174:174 -> o
-    383:383:void validate():174:174 -> o
-    384:384:void validate():174:174 -> o
-    191:196:void validate():174:179 -> o
-    197:197:void validate():0:0 -> o
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":389,"2":390,"3":391,"4":392,"5":393}}
-    389:389:void validate():179:179 -> o
-    390:390:void validate():179:179 -> o
-    391:391:void validate():179:179 -> o
-    392:392:void validate():179:179 -> o
-    393:393:void validate():179:179 -> o
-    376:379:void validate():179:182 -> o
-com.android.tools.r8.shaking.ProguardConfigurationParser$1 -> com.android.tools.r8.shaking.L1:
-    1:1:void <init>():145:145 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.shaking.M1$a:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":250,"2":251,"3":252}}
+    250:250:void parse(java.util.List):227:227 -> a
+    251:251:void parse(java.util.List):227:227 -> a
+    252:252:void parse(java.util.List):227:227 -> a
+    241:243:void parse(java.util.List):227:227 -> a
+    249:249:void parse(java.util.List):233:233 -> 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:java.util.List access$1200():46:46 -> c
+    2:2:com.android.tools.r8.graph.DexItemFactory access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> c
+    1:1:com.android.tools.r8.InputDependencyGraphConsumer access$200(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> d
+    2:2:java.util.List access$400():46:46 -> d
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParserOptions access$300(com.android.tools.r8.shaking.ProguardConfigurationParser):46:46 -> e
+    2:2: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:1:com.android.tools.r8.InputDependencyGraphConsumer emptyInputDependencyGraphConsumer():155:155 -> j
+    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfig():201:202 -> k
+    1:2:com.android.tools.r8.shaking.ProguardConfiguration getConfigRawForTesting():210:211 -> l
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():169:169 -> m
+    1:7:void validate():173:179 -> n
+    8:16:void validate():176:184 -> n
+    17:17:void validate():0:0 -> n
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":400,"2":401,"3":402,"4":403,"5":404}}
+    400:400:void validate():184:184 -> n
+    401:401:void validate():184:184 -> n
+    402:402:void validate():184:184 -> n
+    403:403:void validate():184:184 -> n
+    404:404:void validate():184:184 -> n
+    201:206:void validate():184:189 -> n
+    207:207:void validate():0:0 -> n
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":409,"2":410,"3":411,"4":412,"5":413}}
+    409:409:void validate():189:189 -> n
+    410:410:void validate():189:189 -> n
+    411:411:void validate():189:189 -> n
+    412:412:void validate():189:189 -> n
+    413:413:void validate():189:189 -> n
+    396:399:void validate():189:192 -> n
+com.android.tools.r8.shaking.ProguardConfigurationParser$1 -> com.android.tools.r8.shaking.P1:
+    1:1:void <init>():155:155 -> <init>
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.shaking.Q1$a:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
-    1:3:void <init>(java.lang.String,java.util.List):2294:2296 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2300:2300 -> a
-    2:3:boolean hasBackreference():2308:2309 -> a
-    1:15:boolean hasUnusualCharacters():2313:2327 -> b
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.shaking.N1:
+    1:3:void <init>(java.lang.String,java.util.List):2360:2362 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2366:2366 -> a
+    2:3:boolean hasBackreference():2374:2375 -> a
+    1:15:boolean hasUnusualCharacters():2379:2393 -> b
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.shaking.R1:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
-    1:3:void <init>(java.lang.String,java.util.List,boolean):2338:2340 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.O1:
+    1:3:void <init>(java.lang.String,java.util.List,boolean):2404:2406 -> <init>
+com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.S1:
     boolean $assertionsDisabled -> j
     java.nio.file.Path baseDirectory -> g
     int lineStartPosition -> f
@@ -118695,1819 +119518,2014 @@
     com.android.tools.r8.origin.Origin origin -> h
     java.lang.String contents -> b
     int position -> c
-    1:1:void <clinit>():232:232 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):242:242 -> <init>
-    2:14:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):235:247 -> <init>
-    1:1:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):842:842 -> a
+    1:1:void <clinit>():242:242 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):252:252 -> <init>
+    2:14:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):245:257 -> <init>
+    1:1:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):860:860 -> a
     2:2:com.android.tools.r8.shaking.ClassInlineRule$Builder com.android.tools.r8.shaking.ClassInlineRule.builder():91:91 -> a
-    2:2:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):842 -> a
-    3:3:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):842:842 -> a
+    2:2:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):860 -> a
+    3:3:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):860:860 -> a
     4:4:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    4:4:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):842 -> a
+    4:4:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):860 -> a
     5:5:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> a
-    5:5:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):842 -> a
+    5:5:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):860 -> a
     6:6: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
-    6:6:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):842 -> a
-    7:9:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):843:845 -> a
+    6:6:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):860 -> a
+    7:7:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> a
+    7:7:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):861 -> a
+    8:9:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):862:863 -> a
     10:10:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> a
-    10:10:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):846 -> a
+    10:10:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):864 -> a
     11:21:com.android.tools.r8.shaking.ClassInlineRule com.android.tools.r8.shaking.ClassInlineRule$Builder.build():38:48 -> a
-    11:21:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):847 -> a
-    22:22:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):896:896 -> a
+    11:21:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):865 -> a
+    22:22:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):914:914 -> a
     23:23:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    23:23:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):896 -> a
+    23:23:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):914 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:24:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):54:54 -> a
-    24:24:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):896 -> a
-    25:25:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):896:896 -> a
+    24:24:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):914 -> a
+    25:25:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):914:914 -> a
     26:26:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> a
-    26:26:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):896 -> a
+    26:26:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):914 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     27:27:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):59:59 -> a
-    27:27:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):896 -> a
-    28:30:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):897:899 -> a
+    27:27:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):914 -> a
+    28:28:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> a
+    28:28:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):915 -> a
+    29:30:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):916:917 -> a
     31:32:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:64 -> a
-    31:32:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):900 -> a
-    33:33:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):901:901 -> a
-    34:36:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1136:1138 -> a
-    34:36:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1163 -> a
-    34:36:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1051 -> a
-    37:37:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2135:2135 -> a
-    37:37:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> a
-    37:37:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1139 -> a
-    37:37:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1163 -> a
-    37:37:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1051 -> a
-    38:39:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2128:2129 -> a
-    38:39:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1139 -> a
-    38:39:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1163 -> a
-    38:39:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1051 -> a
-    40:48:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1140:1148 -> a
-    40:48:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1163 -> a
-    40:48:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1051 -> a
-    49:49:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1147:1147 -> a
-    49:49:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1163 -> a
-    49:49:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1051 -> a
-    50:50:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2137:2137 -> a
-    50:50:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> a
-    50:50:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1139 -> a
-    50:50:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1163 -> a
-    50:50:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1051 -> a
-    51:53:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1165:1167 -> a
-    51:53:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1051 -> a
-    54:55:boolean parseNegation():1154:1155 -> a
-    54:55:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1169 -> a
-    54:55:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1051 -> a
+    31:32:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):918 -> a
+    33:33:com.android.tools.r8.shaking.NoOptimizationBaseRule parseNoOptimizationRule(com.android.tools.r8.position.Position,com.android.tools.r8.shaking.NoOptimizationBaseRule$Builder):919:919 -> a
+    34:36:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1162:1164 -> a
+    34:36:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1189 -> a
+    34:36:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1077 -> a
+    37:37:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2201:2201 -> a
+    37:37:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> a
+    37:37:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1165 -> a
+    37:37:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1189 -> a
+    37:37:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1077 -> a
+    38:39:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2194:2195 -> a
+    38:39:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1165 -> a
+    38:39:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1189 -> a
+    38:39:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1077 -> a
+    40:48:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1166:1174 -> a
+    40:48:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1189 -> a
+    40:48:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1077 -> a
+    49:49:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1173:1173 -> a
+    49:49:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1189 -> a
+    49:49:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1077 -> a
+    50:50:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2203:2203 -> a
+    50:50:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> a
+    50:50:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1165 -> a
+    50:50:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1189 -> a
+    50:50:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1077 -> a
+    51:53:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1191:1193 -> a
+    51:53:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1077 -> a
+    54:55:boolean parseNegation():1180:1181 -> a
+    54:55:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1195 -> a
+    54:55:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1077 -> a
     56:56:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getNegatedClassAccessFlags():160:160 -> a
-    56:56:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1170 -> a
+    56:56:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1196 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    56:56:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1051 -> a
+    56:56:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1077 -> a
     57:57:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAccessFlags():151:151 -> a
-    57:57:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1171 -> a
+    57:57:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1197 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    57:57:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1051 -> a
-    58:67:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1172:1181 -> a
-    58:67:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1051 -> a
-    68:70:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1194:1196 -> a
-    68:70:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
+    57:57:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1077 -> a
+    58:67:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1198:1207 -> a
+    58:67:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1077 -> a
+    68:70:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1220:1222 -> a
+    68:70:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
     71:71:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassTypeNegated(boolean):146:146 -> a
-    71:71:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1197 -> a
+    71:71:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1223 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    71:71:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
+    71:71:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
     72:72:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassTypeNegated(boolean):147:147 -> a
-    72:72:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1197 -> a
-    72:72:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
-    73:76:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1199:1202 -> a
-    73:76:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
+    72:72:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1223 -> a
+    72:72:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
+    73:76:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1225:1228 -> a
+    73:76:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
     77:77:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:137 -> a
-    77:77:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1202 -> a
+    77:77:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1228 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    77:77:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
+    77:77:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
     78:78:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):138:138 -> a
-    78:78:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1202 -> a
-    78:78:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
-    79:79:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1204:1204 -> a
-    79:79:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
-    80:81:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1189:1190 -> a
-    80:81:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1204 -> a
-    80:81:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
-    82:85:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1204:1207 -> a
-    82:85:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
+    78:78:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1228 -> a
+    78:78:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
+    79:79:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1230:1230 -> a
+    79:79:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
+    80:81:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1215:1216 -> a
+    80:81:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1230 -> a
+    80:81:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
+    82:85:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1230:1233 -> a
+    82:85:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
     86:86:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:137 -> a
-    86:86:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1207 -> a
+    86:86:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1233 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    86:86:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
+    86:86:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
     87:87:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):138:138 -> a
-    87:87:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1207 -> a
-    87:87:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
-    88:89:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1208:1209 -> a
-    88:89:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
+    87:87:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1233 -> a
+    87:87:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
+    88:89:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1234:1235 -> a
+    88:89:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
     90:90:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:137 -> a
-    90:90:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1209 -> a
+    90:90:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1235 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    90:90:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
+    90:90:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
     91:91:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):138:138 -> a
-    91:91:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1209 -> a
-    91:91:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
-    92:93:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1210:1211 -> a
-    92:93:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
+    91:91:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1235 -> a
+    91:91:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
+    92:93:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1236:1237 -> a
+    92:93:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
     94:94:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:137 -> a
-    94:94:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1211 -> a
+    94:94:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1237 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    94:94:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
+    94:94:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
     95:95:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):138:138 -> a
-    95:95:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1211 -> a
-    95:95:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
-    96:96:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2114:2114 -> a
-    96:96:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1053 -> a
-    97:97:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2135:2135 -> a
-    97:97:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2106 -> a
-    97:97:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> a
-    97:97:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1053 -> a
-    98:101:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2107:2107 -> a
-    98:101:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> a
-    98:101:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1053 -> a
-    104:104:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2110:2110 -> a
-    104:104:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> a
-    104:104:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1053 -> a
-    105:106:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2117:2118 -> a
-    105:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1053 -> a
-    107:107:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1053:1053 -> a
-    108:109:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1220:1221 -> a
-    108:109:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
+    95:95:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1237 -> a
+    95:95:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
+    96:96:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2180:2180 -> a
+    96:96:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1079 -> a
+    97:97:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2201:2201 -> a
+    97:97:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2172 -> a
+    97:97:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> a
+    97:97:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1079 -> a
+    98:101:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2173:2173 -> a
+    98:101:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> a
+    98:101:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1079 -> a
+    104:104:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2176:2176 -> a
+    104:104:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> a
+    104:104:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1079 -> a
+    105:106:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2183:2184 -> a
+    105:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1079 -> a
+    107:107:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1079:1079 -> a
+    108:109:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1246:1247 -> a
+    108:109:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
     110:110:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:96 -> a
-    110:110:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1222 -> a
+    110:110:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1248 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    110:110:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
+    110:110:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
     111:111:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):97:97 -> a
-    111:111:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1222 -> a
-    111:111:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    112:112:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1223:1223 -> a
-    112:112:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
+    111:111:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1248 -> a
+    111:111:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    112:112:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1249:1249 -> a
+    112:112:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
     113:113:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:96 -> a
-    113:113:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1224 -> a
+    113:113:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1250 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    113:113:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
+    113:113:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
     114:114:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):97:97 -> a
-    114:114:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1224 -> a
-    114:114:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    115:117:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1136:1138 -> a
-    115:117:java.util.List parseAnnotationList():1126 -> a
-    115:117:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1228 -> a
-    115:117:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    118:118:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2135:2135 -> a
-    118:118:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> a
-    118:118:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1139 -> a
-    118:118:java.util.List parseAnnotationList():1126 -> a
-    118:118:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1228 -> a
-    118:118:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    119:120:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2128:2129 -> a
-    119:120:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1139 -> a
-    119:120:java.util.List parseAnnotationList():1126 -> a
-    119:120:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1228 -> a
-    119:120:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    121:129:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1140:1148 -> a
-    121:129:java.util.List parseAnnotationList():1126 -> a
-    121:129:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1228 -> a
-    121:129:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    130:130:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1147:1147 -> a
-    130:130:java.util.List parseAnnotationList():1126 -> a
-    130:130:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1228 -> a
-    130:130:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    131:131:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2137:2137 -> a
-    131:131:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> a
-    131:131:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1139 -> a
-    131:131:java.util.List parseAnnotationList():1126 -> a
-    131:131:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1228 -> a
-    131:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    132:136:java.util.List parseAnnotationList():1128:1132 -> a
-    132:136:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1228 -> a
-    132:136:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    137:137:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1228:1228 -> a
-    137:137:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    138:138:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2135:2135 -> a
-    138:138:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> a
-    138:138:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1229 -> a
-    138:138:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    139:140:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2128:2129 -> a
-    139:140:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1229 -> a
-    139:140:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    141:143:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1229:1229 -> a
-    141:143:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
+    114:114:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1250 -> a
+    114:114:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    115:117:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1162:1164 -> a
+    115:117:java.util.List parseAnnotationList():1152 -> a
+    115:117:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1254 -> a
+    115:117:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    118:118:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2201:2201 -> a
+    118:118:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> a
+    118:118:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1165 -> a
+    118:118:java.util.List parseAnnotationList():1152 -> a
+    118:118:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1254 -> a
+    118:118:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    119:120:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2194:2195 -> a
+    119:120:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1165 -> a
+    119:120:java.util.List parseAnnotationList():1152 -> a
+    119:120:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1254 -> a
+    119:120:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    121:129:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1166:1174 -> a
+    121:129:java.util.List parseAnnotationList():1152 -> a
+    121:129:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1254 -> a
+    121:129:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    130:130:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1173:1173 -> a
+    130:130:java.util.List parseAnnotationList():1152 -> a
+    130:130:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1254 -> a
+    130:130:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    131:131:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2203:2203 -> a
+    131:131:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> a
+    131:131:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1165 -> a
+    131:131:java.util.List parseAnnotationList():1152 -> a
+    131:131:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1254 -> a
+    131:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    132:136:java.util.List parseAnnotationList():1154:1158 -> a
+    132:136:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1254 -> a
+    132:136:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    137:137:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1254:1254 -> a
+    137:137:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    138:138:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2201:2201 -> a
+    138:138:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> a
+    138:138:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1255 -> a
+    138:138:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    139:140:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2194:2195 -> a
+    139:140:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1255 -> a
+    139:140:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    141:143:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1255:1255 -> a
+    141:143:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
     144:145:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceClassName(com.android.tools.r8.shaking.ProguardTypeMatcher):109:110 -> a
-    144:145:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1229 -> a
-    144:145:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    146:146:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2137:2137 -> a
-    146:146:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> a
-    146:146:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1229 -> a
-    146:146:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1054 -> a
-    147:148:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1239:1240 -> a
-    147:148:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    149:149:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1252:1252 -> a
-    149:149:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    149:149:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    150:152:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1136:1138 -> a
-    150:152:java.util.List parseAnnotationList():1126 -> a
-    150:152:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1253 -> a
-    150:152:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    150:152:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    153:153:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2135:2135 -> a
-    153:153:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> a
-    153:153:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1139 -> a
-    153:153:java.util.List parseAnnotationList():1126 -> a
-    153:153:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1253 -> a
-    153:153:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    153:153:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    154:155:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2128:2129 -> a
-    154:155:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1139 -> a
-    154:155:java.util.List parseAnnotationList():1126 -> a
-    154:155:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1253 -> a
-    154:155:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    154:155:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    156:164:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1140:1148 -> a
-    156:164:java.util.List parseAnnotationList():1126 -> a
-    156:164:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1253 -> a
-    156:164:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    156:164:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    165:165:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1147:1147 -> a
-    165:165:java.util.List parseAnnotationList():1126 -> a
-    165:165:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1253 -> a
-    165:165:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    165:165:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    166:166:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2137:2137 -> a
-    166:166:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> a
-    166:166:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1139 -> a
-    166:166:java.util.List parseAnnotationList():1126 -> a
-    166:166:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1253 -> a
-    166:166:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    166:166:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    167:171:java.util.List parseAnnotationList():1128:1132 -> a
-    167:171:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1253 -> a
-    167:171:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    167:171:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    172:172:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1253:1253 -> a
-    172:172:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    172:172:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    173:173:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1261:1261 -> a
-    173:173:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1254 -> a
-    173:173:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    173:173:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    174:175:boolean parseNegation():1154:1155 -> a
-    174:175:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1263 -> a
-    174:175:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1254 -> a
-    174:175:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    174:175:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    176:221:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1265:1310 -> a
-    176:221:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1254 -> a
-    176:221:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    176:221:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    222:239:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1298:1315 -> a
-    222:239:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1254 -> a
-    222:239:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    222:239:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    240:245:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1289:1294 -> a
-    240:245:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1254 -> a
-    240:245:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    240:245:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    246:247:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1284:1285 -> a
-    246:247:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1254 -> a
-    246:247:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    246:247:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    248:249:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1279:1280 -> a
-    248:249:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1254 -> a
-    248:249:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    248:249:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    250:251:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1274:1275 -> a
-    250:251:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1254 -> a
-    250:251:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    250:251:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    252:308:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1269:1325 -> a
-    252:308:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1254 -> a
-    252:308:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    252:308:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    309:328:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1333:1352 -> a
-    309:328:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    309:328:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    309:328:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    329:334:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1855:1860 -> a
-    329:334:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1354 -> a
-    329:334:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    329:334:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    329:334:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    335:340:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1356:1361 -> a
-    335:340:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    335:340:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    335:340:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    341:349:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1494:1502 -> a
-    341:349:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1363 -> a
-    341:349:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    341:349:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    341:349:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    350:352:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1364:1366 -> a
-    350:352:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    350:352:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    350:352:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    353:353:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1503:1503 -> a
-    353:353:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1363 -> a
-    353:353:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    353:353:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    353:353:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    354:354:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1500:1500 -> a
-    354:354:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1363 -> a
-    354:354:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    354:354:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    354:354:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    355:357:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1368:1370 -> a
-    355:357:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    355:357:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    355:357:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    358:358:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
-    358:358:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1371 -> a
-    358:358:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    358:358:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    358:358:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
+    144:145:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1255 -> a
+    144:145:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    146:146:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2203:2203 -> a
+    146:146:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> a
+    146:146:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1255 -> a
+    146:146:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1080 -> a
+    147:148:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1265:1266 -> a
+    147:148:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    149:149:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1278:1278 -> a
+    149:149:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    149:149:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    150:152:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1162:1164 -> a
+    150:152:java.util.List parseAnnotationList():1152 -> a
+    150:152:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1279 -> a
+    150:152:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    150:152:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    153:153:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2201:2201 -> a
+    153:153:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> a
+    153:153:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1165 -> a
+    153:153:java.util.List parseAnnotationList():1152 -> a
+    153:153:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1279 -> a
+    153:153:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    153:153:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    154:155:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2194:2195 -> a
+    154:155:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1165 -> a
+    154:155:java.util.List parseAnnotationList():1152 -> a
+    154:155:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1279 -> a
+    154:155:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    154:155:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    156:164:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1166:1174 -> a
+    156:164:java.util.List parseAnnotationList():1152 -> a
+    156:164:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1279 -> a
+    156:164:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    156:164:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    165:165:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1173:1173 -> a
+    165:165:java.util.List parseAnnotationList():1152 -> a
+    165:165:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1279 -> a
+    165:165:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    165:165:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    166:166:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2203:2203 -> a
+    166:166:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> a
+    166:166:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1165 -> a
+    166:166:java.util.List parseAnnotationList():1152 -> a
+    166:166:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1279 -> a
+    166:166:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    166:166:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    167:171:java.util.List parseAnnotationList():1154:1158 -> a
+    167:171:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1279 -> a
+    167:171:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    167:171:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    172:172:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1279:1279 -> a
+    172:172:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    172:172:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    173:173:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1287:1287 -> a
+    173:173:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1280 -> a
+    173:173:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    173:173:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    174:175:boolean parseNegation():1180:1181 -> a
+    174:175:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1289 -> a
+    174:175:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1280 -> a
+    174:175:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    174:175:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    176:231:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1291:1346 -> a
+    176:231:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1280 -> a
+    176:231:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    176:231:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    232:233:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1340:1341 -> a
+    232:233:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1280 -> a
+    232:233:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    232:233:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    234:241:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1329:1336 -> a
+    234:241:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1280 -> a
+    234:241:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    234:241:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    242:247:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1320:1325 -> a
+    242:247:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1280 -> a
+    242:247:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    242:247:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    248:249:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1315:1316 -> a
+    248:249:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1280 -> a
+    248:249:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    248:249:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    250:251:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1310:1311 -> a
+    250:251:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1280 -> a
+    250:251:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    250:251:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    252:253:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1305:1306 -> a
+    252:253:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1280 -> a
+    252:253:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    252:253:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    254:255:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1300:1301 -> a
+    254:255:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1280 -> a
+    254:255:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    254:255:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    256:317:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1295:1356 -> a
+    256:317:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1280 -> a
+    256:317:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    256:317:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    318:337:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1364:1383 -> a
+    318:337:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    318:337:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    318:337:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    338:343:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1913:1918 -> a
+    338:343:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1385 -> a
+    338:343:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    338:343:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    338:343:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    344:349:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1387:1392 -> a
+    344:349:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    344:349:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    344:349:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    350:358:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1530:1538 -> a
+    350:358:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1394 -> a
+    350:358:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    350:358:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    350:358:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    359:361:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1395:1397 -> a
+    359:361:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    359:361:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    359:361:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    362:362:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1539:1539 -> a
+    362:362:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1394 -> a
+    362:362:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    362:362:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    362:362:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    363:363:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1536:1536 -> a
+    363:363:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1394 -> a
+    363:363:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    363:363:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    363:363:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    364:366:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1399:1401 -> a
+    364:366:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    364:366:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    364:366:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    367:367:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
+    367:367:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1402 -> a
+    367:367:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    367:367:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    367:367:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(4)"]}
-    359:365:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1372:1378 -> a
-    359:365:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    359:365:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    359:365:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    366:374:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1373:1381 -> a
-    366:374:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    366:374:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    366:374:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    375:375:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
-    375:375:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1382 -> a
-    375:375:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    375:375:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    375:375:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
+    368:374:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1403:1409 -> a
+    368:374:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    368:374:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    368:374:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    375:383:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1404:1412 -> a
+    375:383:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    375:383:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    375:383:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    384:384:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
+    384:384:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1413 -> a
+    384:384:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    384:384:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    384:384:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(4)"]}
-    376:382:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1383:1389 -> a
-    376:382:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    376:382:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    376:382:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    383:390:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1384:1391 -> a
-    383:390:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    383:390:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    383:390:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    391:396:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1855:1860 -> a
-    391:396:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1393 -> a
-    391:396:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    391:396:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    391:396:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    397:401:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1395:1399 -> a
-    397:401:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    397:401:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    397:401:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    402:410:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1494:1502 -> a
-    402:410:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1400 -> a
-    402:410:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    402:410:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    402:410:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    411:415:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1402:1406 -> a
-    411:415:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    411:415:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    411:415:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    416:418:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1405:1407 -> a
-    416:418:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    416:418:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    416:418:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    419:419:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1503:1503 -> a
-    419:419:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1400 -> a
-    419:419:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    419:419:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    419:419:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    420:420:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1500:1500 -> a
-    420:420:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1400 -> a
-    420:420:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    420:420:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    420:420:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    421:422:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1409:1410 -> a
-    421:422:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    421:422:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    421:422:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    423:429:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2243:2243 -> a
-    423:429:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1410 -> a
-    423:429:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    423:429:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    423:429:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    430:431:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1412:1413 -> a
-    430:431:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    430:431:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    430:431:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    432:438:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2243:2243 -> a
-    432:438:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1413 -> a
-    432:438:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    432:438:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    432:438:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    439:443:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1415:1419 -> a
-    439:443:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    439:443:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    439:443:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    444:460:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1418:1434 -> a
-    444:460:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    444:460:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    444:460:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    461:462:java.lang.String acceptFieldNameOrIntegerForReturn():1982:1983 -> a
-    461:462:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1435 -> a
-    461:462:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    461:462:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    461:462:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    463:463:boolean eof(int):1729:1729 -> a
-    463:463:java.lang.String acceptFieldNameOrIntegerForReturn():1985 -> a
-    463:463:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1435 -> a
-    463:463:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    463:463:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    463:463:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    464:464:java.lang.String acceptFieldNameOrIntegerForReturn():1986:1986 -> a
-    464:464:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1435 -> a
-    464:464:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    464:464:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    464:464:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    465:465:boolean eof(int):1729:1729 -> a
-    465:465:java.lang.String acceptFieldNameOrIntegerForReturn():1987 -> a
-    465:465:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1435 -> a
-    465:465:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    465:465:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    465:465:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    466:466:char peekCharAt(int):1780:1780 -> a
-    466:466:java.lang.String acceptFieldNameOrIntegerForReturn():1987 -> a
-    466:466:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1435 -> a
-    466:466:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    466:466:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    466:466:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    467:467:boolean eof(int):1729:1729 -> a
-    467:467:char peekCharAt(int):1780 -> a
-    467:467:java.lang.String acceptFieldNameOrIntegerForReturn():1987 -> a
-    467:467:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1435 -> a
-    467:467:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    467:467:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    467:467:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    468:469:char peekCharAt(int):1780:1781 -> a
-    468:469:java.lang.String acceptFieldNameOrIntegerForReturn():1987 -> a
-    468:469:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1435 -> a
-    468:469:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    468:469:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    468:469:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    470:482:java.lang.String acceptFieldNameOrIntegerForReturn():1991:2003 -> a
-    470:482:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1435 -> a
-    470:482:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    470:482:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    470:482:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    483:484:boolean isInteger(java.lang.String):1716:1717 -> a
-    483:484:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1437 -> a
-    483:484:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    483:484:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    483:484:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    485:499:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1438:1452 -> a
-    485:499:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    485:499:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    485:499:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    500:500:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1451:1451 -> a
-    500:500:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    500:500:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    500:500:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    501:513:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1449:1461 -> a
-    501:513:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    501:513:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    501:513:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    514:514:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1460:1460 -> a
-    514:514:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    514:514:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    514:514:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    515:520:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1459:1464 -> a
-    515:520:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    515:520:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    515:520:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    521:545:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1463:1487 -> a
-    521:545:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1255 -> a
-    521:545:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    521:545:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    546:546:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1256:1256 -> a
-    546:546:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1242 -> a
-    546:546:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    547:547:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> a
-    547:547:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1243 -> a
+    385:391:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1414:1420 -> a
+    385:391:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    385:391:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    385:391:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    392:399:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1415:1422 -> a
+    392:399:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    392:399:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    392:399:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    400:405:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1913:1918 -> a
+    400:405:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1424 -> a
+    400:405:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    400:405:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    400:405:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    406:410:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1426:1430 -> a
+    406:410:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    406:410:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    406:410:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    411:419:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1530:1538 -> a
+    411:419:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1431 -> a
+    411:419:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    411:419:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    411:419:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    420:424:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1433:1437 -> a
+    420:424:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    420:424:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    420:424:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    425:427:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1436:1438 -> a
+    425:427:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    425:427:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    425:427:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    428:428:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1539:1539 -> a
+    428:428:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1431 -> a
+    428:428:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    428:428:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    428:428:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    429:429:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1536:1536 -> a
+    429:429:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1431 -> a
+    429:429:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    429:429:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    429:429:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    430:431:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1440:1441 -> a
+    430:431:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    430:431:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    430:431:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    432:438:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2309:2309 -> a
+    432:438:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1441 -> a
+    432:438:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    432:438:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    432:438:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    439:440:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1443:1444 -> a
+    439:440:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    439:440:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    439:440:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    441:447:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2309:2309 -> a
+    441:447:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1444 -> a
+    441:447:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    441:447:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    441:447:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    448:452:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1446:1450 -> a
+    448:452:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    448:452:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    448:452:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    453:470:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1449:1466 -> a
+    453:470:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    453:470:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    453:470:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    471:487:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1465:1481 -> a
+    471:487:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    471:487:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    471:487:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    488:496:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1480:1488 -> a
+    488:496:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    488:496:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    488:496:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    497:514:java.lang.String acceptQualifiedFieldName():2040:2057 -> a
+    497:514:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1493 -> a
+    497:514:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    497:514:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    497:514:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    515:516:char peekCharAt(int):1838:1839 -> a
+    515:516:java.lang.String acceptQualifiedFieldName():2057 -> a
+    515:516:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1493 -> a
+    515:516:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    515:516:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    515:516:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    517:529:java.lang.String acceptQualifiedFieldName():2057:2069 -> a
+    517:529:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1493 -> a
+    517:529:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    517:529:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    517:529:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    530:534:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1495:1499 -> a
+    530:534:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    530:534:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    530:534:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    535:535:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1498:1498 -> a
+    535:535:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    535:535:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    535:535:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    536:541:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1497:1502 -> a
+    536:541:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    536:541:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    536:541:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    542:548:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1501:1507 -> a
+    542:548:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    542:548:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    542:548:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    549:615:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1457:1523 -> a
+    549:615:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1281 -> a
+    549:615:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    549:615:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    616:616:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1282:1282 -> a
+    616:616:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1268 -> a
+    616:616:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    617:617:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> a
+    617:617:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1269 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    547:547:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    548:551:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1243:1246 -> a
-    548:551:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1055 -> a
-    552:552:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2137:2137 -> a
-    552:552:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2106 -> a
-    552:552:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> a
-    552:552:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1053 -> a
-    553:553:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1213:1213 -> a
-    553:553:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
-    554:555:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1189:1190 -> a
-    554:555:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1213 -> a
-    554:555:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
-    556:556:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1213:1213 -> a
-    556:556:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1052 -> a
-    557:578:java.nio.file.Path parseFileName(boolean):1578:1599 -> a
-    579:579:java.nio.file.Path parseFileName(boolean):1597:1597 -> a
-    580:600:java.lang.String replaceSystemPropertyReferences(java.lang.String):1537:1557 -> a
-    580:600:java.nio.file.Path parseFileName(boolean):1602 -> a
-    601:601:java.nio.file.Path parseFileName(boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":618,"2":619,"3":620,"4":621,"5":622,"6":623}}
-    618:618:java.lang.String replaceSystemPropertyReferences(java.lang.String):1555:1555 -> a
-    618:618:java.nio.file.Path parseFileName(boolean):1602 -> a
-    619:619:java.lang.String replaceSystemPropertyReferences(java.lang.String):1555:1555 -> a
-    619:619:java.nio.file.Path parseFileName(boolean):1602 -> a
-    620:620:java.lang.String replaceSystemPropertyReferences(java.lang.String):1555:1555 -> a
-    620:620:java.nio.file.Path parseFileName(boolean):1602 -> a
-    621:621:java.lang.String replaceSystemPropertyReferences(java.lang.String):1555:1555 -> a
-    621:621:java.nio.file.Path parseFileName(boolean):1602 -> a
-    622:622:java.lang.String replaceSystemPropertyReferences(java.lang.String):1555:1555 -> a
-    622:622:java.nio.file.Path parseFileName(boolean):1602 -> a
-    623:623:java.lang.String replaceSystemPropertyReferences(java.lang.String):1555:1555 -> a
-    623:623:java.nio.file.Path parseFileName(boolean):1602 -> a
-    602:614:java.lang.String replaceSystemPropertyReferences(java.lang.String):1555:1567 -> a
-    602:614:java.nio.file.Path parseFileName(boolean):1602 -> a
-    615:615:java.nio.file.Path parseFileName(boolean):1604:1604 -> a
-    616:616:java.nio.file.Path parseFileName(boolean):1593:1593 -> a
-    617:617:java.nio.file.Path parseFileName(boolean):1582:1582 -> a
-    624:626:boolean lambda$parseFileName$1(boolean,char,boolean,int):1588:1590 -> a
-    627:628:boolean acceptChar(char):1751:1752 -> a
-    629:629:int remainingChars():1789:1789 -> a
-    629:629:boolean acceptString(java.lang.String):1799 -> a
-    630:638:boolean acceptString(java.lang.String):1799:1807 -> a
-    639:639:boolean lambda$acceptQuotedOrUnquotedString$4(char,int):1817:1817 -> a
-    640:640:boolean isClassName(int):1833:1833 -> a
-    641:641:java.lang.String acceptClassName():1850:1850 -> a
-    642:652:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1865:1875 -> a
-    653:653:boolean eof(int):1729:1729 -> a
-    653:653:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1877 -> a
-    654:667:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1878:1891 -> a
-    668:670:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1886:1886 -> a
-    678:678:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1894:1894 -> a
-    679:679:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4636,"2":4637,"3":4638}}
-    4636:4636:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1894:1894 -> a
-    4637:4637:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1894:1894 -> a
-    4638:4638:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1894:1894 -> a
-    2574:2575:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1895:1896 -> a
-    2576:2588:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1894:1906 -> a
-    2589:2627:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1905:1943 -> a
-    2628:2628:boolean isPackageName(int):1843:1843 -> a
-    2628:2628:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1948 -> a
-    2629:2636:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1949:1956 -> a
-    2637:2637:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4700,"2":4701,"3":4702}}
-    4700:4700:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1956:1956 -> a
-    4701:4701:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1956:1956 -> a
-    4702:4702:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1956:1956 -> a
-    4593:4598:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1956:1956 -> a
-    4599:4599:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1950:1950 -> a
-    4600:4627:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1945:1972 -> a
-    4628:4635:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1971:1978 -> a
-    4703:4703:java.lang.String acceptString(java.util.function.IntPredicate):2049:2049 -> a
-    4704:4704:boolean eof(int):1729:1729 -> a
-    4704:4704:java.lang.String acceptString(java.util.function.IntPredicate):2051 -> a
-    4705:4716:java.lang.String acceptString(java.util.function.IntPredicate):2052:2063 -> a
-    4717:4717:boolean pathFilterMatcher(java.lang.Integer):2143:2143 -> a
-    4718:4719:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):2222:2223 -> a
-    4720:4723:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2257:2260 -> a
-    4724:4725:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2273:2274 -> a
-    4726:4726:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.access$1500(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):47:47 -> a
-    4726:4726:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2274 -> a
-    4727:4733: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):2280:2286 -> a
-    4727:4733:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.access$1500(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):47 -> a
-    4727:4733:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2274 -> a
-    1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):829:829 -> b
+    617:617:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    618:621:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1269:1272 -> a
+    618:621:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1081 -> a
+    622:622:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2203:2203 -> a
+    622:622:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2172 -> a
+    622:622:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> a
+    622:622:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1079 -> a
+    623:623:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1239:1239 -> a
+    623:623:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
+    624:625:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1215:1216 -> a
+    624:625:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1239 -> a
+    624:625:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
+    626:626:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1239:1239 -> a
+    626:626:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1078 -> a
+    627:648:java.nio.file.Path parseFileName(boolean):1614:1635 -> a
+    649:649:java.nio.file.Path parseFileName(boolean):1633:1633 -> a
+    650:670:java.lang.String replaceSystemPropertyReferences(java.lang.String):1573:1593 -> a
+    650:670:java.nio.file.Path parseFileName(boolean):1638 -> a
+    671:671:java.nio.file.Path parseFileName(boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":688,"2":689,"3":690,"4":691,"5":692,"6":693}}
+    688:688:java.lang.String replaceSystemPropertyReferences(java.lang.String):1591:1591 -> a
+    688:688:java.nio.file.Path parseFileName(boolean):1638 -> a
+    689:689:java.lang.String replaceSystemPropertyReferences(java.lang.String):1591:1591 -> a
+    689:689:java.nio.file.Path parseFileName(boolean):1638 -> a
+    690:690:java.lang.String replaceSystemPropertyReferences(java.lang.String):1591:1591 -> a
+    690:690:java.nio.file.Path parseFileName(boolean):1638 -> a
+    691:691:java.lang.String replaceSystemPropertyReferences(java.lang.String):1591:1591 -> a
+    691:691:java.nio.file.Path parseFileName(boolean):1638 -> a
+    692:692:java.lang.String replaceSystemPropertyReferences(java.lang.String):1591:1591 -> a
+    692:692:java.nio.file.Path parseFileName(boolean):1638 -> a
+    693:693:java.lang.String replaceSystemPropertyReferences(java.lang.String):1591:1591 -> a
+    693:693:java.nio.file.Path parseFileName(boolean):1638 -> a
+    672:684:java.lang.String replaceSystemPropertyReferences(java.lang.String):1591:1603 -> a
+    672:684:java.nio.file.Path parseFileName(boolean):1638 -> a
+    685:685:java.nio.file.Path parseFileName(boolean):1640:1640 -> a
+    686:686:java.nio.file.Path parseFileName(boolean):1629:1629 -> a
+    687:687:java.nio.file.Path parseFileName(boolean):1618:1618 -> a
+    694:696:boolean lambda$parseFileName$1(boolean,char,boolean,int):1624:1626 -> a
+    697:697:boolean eof(int):1787:1787 -> a
+    698:699:boolean acceptChar(char):1809:1810 -> a
+    700:700:int remainingChars():1847:1847 -> a
+    700:700:boolean acceptString(java.lang.String):1857 -> a
+    701:709:boolean acceptString(java.lang.String):1857:1865 -> a
+    710:710:boolean lambda$acceptQuotedOrUnquotedString$4(char,int):1875:1875 -> a
+    711:711:java.lang.String acceptClassName():1908:1908 -> a
+    712:738:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1923:1949 -> a
+    739:741:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1944:1944 -> a
+    749:749:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1952:1952 -> a
+    750:750:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4823,"2":4824,"3":4825}}
+    4823:4823:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1952:1952 -> a
+    4824:4824:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1952:1952 -> a
+    4825:4825:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1952:1952 -> a
+    2703:2704:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1953:1954 -> a
+    2705:2717:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1952:1964 -> a
+    2718:2756:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1963:2001 -> a
+    2757:2757:boolean isPackageName(int):1901:1901 -> a
+    2757:2757:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):2006 -> a
+    2758:2765:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):2007:2014 -> a
+    2766:2766:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4887,"2":4888,"3":4889}}
+    4887:4887:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):2014:2014 -> a
+    4888:4888:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):2014:2014 -> a
+    4889:4889:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):2014:2014 -> a
+    4780:4785:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):2014:2014 -> a
+    4786:4786:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):2008:2008 -> a
+    4787:4814:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):2003:2030 -> a
+    4815:4822:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):2029:2036 -> a
+    4890:4904:java.lang.String acceptString(java.util.function.IntPredicate):2115:2129 -> a
+    4905:4905:boolean pathFilterMatcher(java.lang.Integer):2209:2209 -> a
+    4906:4907:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):2288:2289 -> a
+    4908:4911:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2323:2326 -> a
+    4912:4913:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2339:2340 -> a
+    4914:4914:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.access$1400(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):46:46 -> a
+    4914:4914:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2340 -> a
+    4915:4921: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):2346:2352 -> a
+    4915:4921:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.access$1400(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):46 -> a
+    4915:4921:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2340 -> a
+    1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):847:847 -> b
     2:2:com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder com.android.tools.r8.shaking.ProguardCheckDiscardRule.builder():74:74 -> b
-    2:2:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):829 -> b
-    3:3:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):829:829 -> b
+    2:2:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):847 -> b
+    3:3:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):847:847 -> b
     4:4:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> b
-    4:4:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):830 -> b
+    4:4:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):848 -> b
     5:5:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> b
-    5:5:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):831 -> b
-    6:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):832:834 -> b
+    5:5:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):849 -> b
+    6:6:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> b
+    6:6:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):850 -> b
+    7:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):851:852 -> b
     9:9:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> b
-    9:9:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):835 -> b
+    9:9:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):853 -> b
     10:20:com.android.tools.r8.shaking.ProguardCheckDiscardRule com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder.build():26:36 -> b
-    10:20:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):836 -> b
-    21:21:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):918:918 -> b
+    10:20:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):854 -> b
+    21:21:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):936:936 -> b
     22:22:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule.builder():93:93 -> b
-    22:22:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):918 -> b
-    23:23:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):918:918 -> b
+    22:22:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):936 -> b
+    23:23:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):936:936 -> b
     24:24:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> b
-    24:24:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):919 -> b
+    24:24:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):937 -> b
     25:25:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> b
-    25:25:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):920 -> b
+    25:25:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):938 -> b
     26:26:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule$Builder.setType(com.android.tools.r8.shaking.InlineRule$Type):34:34 -> b
-    26:26:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):921 -> b
-    27:29:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):922:924 -> b
+    26:26:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):939 -> b
+    27:27:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> b
+    27:27:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):940 -> b
+    28:29:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):941:942 -> b
     30:30:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> b
-    30:30:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):925 -> b
+    30:30:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):943 -> b
     31:41:com.android.tools.r8.shaking.InlineRule com.android.tools.r8.shaking.InlineRule$Builder.build():40:50 -> b
-    31:41:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):926 -> b
-    42:43:void expectChar(char):1793:1794 -> b
-    44:48:java.lang.Integer acceptInteger():1825:1829 -> b
-    49:49:boolean lambda$acceptPattern$5(int):2042:2042 -> b
-    50:50:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2207:2207 -> b
-    51:60:java.lang.String snippetForPosition():2183:2192 -> b
-    51:60:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2207 -> b
-    61:67:java.lang.String snippetForPosition():2188:2194 -> b
-    61:67:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2207 -> b
-    68:68:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2207:2207 -> b
-    1:1:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):646:646 -> c
+    31:41:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):944 -> b
+    42:43:void expectChar(char):1851:1852 -> b
+    44:48:java.lang.Integer acceptInteger():1883:1887 -> b
+    49:49:boolean isClassName(int):1891:1891 -> b
+    50:50:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2273:2273 -> b
+    51:60:java.lang.String snippetForPosition():2249:2258 -> b
+    51:60:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2273 -> b
+    61:67:java.lang.String snippetForPosition():2254:2260 -> b
+    61:67:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2273 -> b
+    68:68:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2273:2273 -> b
+    1:1:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):677:677 -> c
     2:2:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> c
-    2:2:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):646 -> c
-    3:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):648:648 -> c
+    2:2:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):677 -> c
+    3:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):679:679 -> c
     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):608:608 -> c
-    4:4:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):647 -> c
-    5:5:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):649:649 -> c
+    4:4:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):678 -> c
+    5:5:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):680:680 -> c
     6:6:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> c
-    6:6:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):649 -> c
-    7:7:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):650:650 -> c
+    6:6:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):680 -> c
+    7:7:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):681:681 -> c
     8:8:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> c
-    8:8:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):650 -> c
-    9:9:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):758:758 -> c
-    9:9:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):651 -> c
-    10:10:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> c
-    10:10:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):761 -> c
-    10:10:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):651 -> c
+    8:8:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):681 -> c
+    9:9:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):776:776 -> c
+    9:9:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):682 -> c
+    10:10:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> c
+    10:10:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):779 -> c
+    10:10:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):682 -> c
     11:11:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):0:0 -> c
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":19,"2":20,"3":21,"4":22,"5":23}}
-    19:19:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> c
-    19:19:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):761 -> c
-    19:19:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):651 -> c
-    20:20:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> c
-    20:20:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):761 -> c
-    20:20:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):651 -> c
-    21:21:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> c
-    21:21:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):761 -> c
-    21:21:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):651 -> c
-    22:22:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> c
-    22:22:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):761 -> c
-    22:22:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):651 -> c
-    23:23:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> c
-    23:23:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):761 -> c
-    23:23:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):651 -> c
-    12:14:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> c
-    12:14:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):761 -> c
-    12:14:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):651 -> c
-    15:18:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):763:766 -> c
-    15:18:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):651 -> c
-    24:26:boolean skipFlag(java.lang.String):702:704 -> c
-    27:31:void expectClosingQuote(char):1764:1768 -> c
-    32:32:void expectClosingQuote(char):1766:1766 -> c
-    33:33:boolean lambda$acceptString$3(int):1812:1812 -> c
-    34:34:java.lang.String acceptPattern():2040:2040 -> c
-    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):626:633 -> d
-    9:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):632:632 -> d
-    10:10:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2232:2232 -> d
-    10:10:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):640 -> d
+    19:19:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> c
+    19:19:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):779 -> c
+    19:19:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):682 -> c
+    20:20:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> c
+    20:20:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):779 -> c
+    20:20:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):682 -> c
+    21:21:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> c
+    21:21:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):779 -> c
+    21:21:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):682 -> c
+    22:22:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> c
+    22:22:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):779 -> c
+    22:22:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):682 -> c
+    23:23:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> c
+    23:23:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):779 -> c
+    23:23:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):682 -> c
+    12:14:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> c
+    12:14:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):779 -> c
+    12:14:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):682 -> c
+    15:18:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):781:784 -> c
+    15:18:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):682 -> c
+    24:26:boolean skipFlag(java.lang.String):720:722 -> c
+    27:31:void expectClosingQuote(char):1822:1826 -> c
+    32:32:void expectClosingQuote(char):1824:1824 -> c
+    33:33:java.lang.String acceptPattern():2106:2106 -> c
+    34:34:boolean lambda$acceptPattern$5(int):2108:2108 -> c
+    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):657:664 -> d
+    9:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):663:663 -> d
+    10:10:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2298:2298 -> d
+    10:10:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):671 -> d
     11:11:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):0:0 -> d
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":15,"2":16,"3":17,"4":18,"5":19}}
-    15:15:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2232:2232 -> d
-    15:15:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):640 -> d
-    16:16:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2232:2232 -> d
-    16:16:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):640 -> d
-    17:17:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2232:2232 -> d
-    17:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):640 -> d
-    18:18:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2232:2232 -> d
-    18:18:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):640 -> d
-    19:19:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2232:2232 -> d
-    19:19:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):640 -> d
-    12:14:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2232:2232 -> d
-    12:14:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):640 -> d
-    20:29:boolean skipOptionWithClassSpec(java.lang.String):737:746 -> d
-    30:30:boolean lambda$parseFileFilter$2(int):1650:1650 -> d
-    31:34:boolean hasNextChar(char):1733:1736 -> d
-    35:35:char acceptQuoteIfPresent():1760:1760 -> d
-    36:39:boolean hasNextChar(java.util.function.Predicate):1740:1743 -> d
-    36:39:char acceptQuoteIfPresent():1760 -> d
-    40:40:char readChar():1785:1785 -> d
-    40:40:char acceptQuoteIfPresent():1760 -> d
+    15:15:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2298:2298 -> d
+    15:15:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):671 -> d
+    16:16:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2298:2298 -> d
+    16:16:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):671 -> d
+    17:17:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2298:2298 -> d
+    17:17:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):671 -> d
+    18:18:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2298:2298 -> d
+    18:18:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):671 -> d
+    19:19:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2298:2298 -> d
+    19:19:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):671 -> d
+    12:14:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2298:2298 -> d
+    12:14:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):671 -> d
+    20:29:boolean skipOptionWithClassSpec(java.lang.String):755:764 -> d
+    30:33:boolean hasNextChar(char):1791:1794 -> d
+    34:34:char acceptQuoteIfPresent():1818:1818 -> d
+    35:38:boolean hasNextChar(java.util.function.Predicate):1798:1801 -> d
+    35:38:char acceptQuoteIfPresent():1818 -> d
+    39:39:char readChar():1843:1843 -> d
+    39:39:char acceptQuoteIfPresent():1818 -> d
+    40:40:boolean lambda$acceptString$3(int):1870:1870 -> d
     boolean isQuote(char) -> e
-    1:6:boolean skipOptionWithOptionalSingleArg(java.lang.String):723:728 -> e
-    7:8:void skipSingleArgument():786:787 -> e
-    7:8:boolean skipOptionWithOptionalSingleArg(java.lang.String):729 -> e
-    9:9:char readChar():1785:1785 -> e
-    9:9:void skipSingleArgument():788 -> e
-    9:9:boolean skipOptionWithOptionalSingleArg(java.lang.String):729 -> e
-    10:10:boolean lambda$skipOptimizationName$0(int):778:778 -> e
-    11:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):794:794 -> e
-    12:12:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> e
-    12:12:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):795 -> e
+    1:6:boolean skipOptionWithOptionalSingleArg(java.lang.String):741:746 -> e
+    7:8:void skipSingleArgument():804:805 -> e
+    7:8:boolean skipOptionWithOptionalSingleArg(java.lang.String):747 -> e
+    9:9:char readChar():1843:1843 -> e
+    9:9:void skipSingleArgument():806 -> e
+    9:9:boolean skipOptionWithOptionalSingleArg(java.lang.String):747 -> e
+    10:10:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):812:812 -> e
+    11:11:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> e
+    11:11:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):813 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> e
-    13:13:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):796 -> e
-    14:15:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1059:1060 -> e
-    14:15:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    16:16:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    16:16:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1061 -> e
-    16:16:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    17:24:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1061:1068 -> e
-    17:24:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    25:25:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    25:25:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1069 -> e
-    25:25:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    26:28:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1069:1071 -> e
-    26:28:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    29:29:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    29:29:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1072 -> e
-    29:29:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    30:36:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1072:1078 -> e
-    30:36:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    37:37:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    37:37:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    37:37:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1079 -> e
-    37:37:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    38:38:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":109,"2":110,"3":111,"4":112,"5":113,"6":114,"7":115}}
-    109:109:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    109:109:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    109:109:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1079 -> e
-    109:109:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    110:110:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    110:110:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    110:110:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1079 -> e
-    110:110:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    111:111:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    111:111:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    111:111:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1079 -> e
-    111:111:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    112:112:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    112:112:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    112:112:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1079 -> e
-    112:112:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    113:113:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    113:113:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    113:113:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1079 -> e
-    113:113:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    114:114:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    114:114:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    114:114:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1079 -> e
-    114:114:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    115:115:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    115:115:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    115:115:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1079 -> e
-    115:115:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    39:42:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    39:42:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    39:42:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1079 -> e
-    39:42:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    43:50:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1082:1089 -> e
-    43:50:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    51:51:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    51:51:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    51:51:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1090 -> e
-    51:51:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    52:52:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":116,"2":117,"3":118,"4":119,"5":120,"6":121,"7":122}}
-    116:116:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    116:116:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    116:116:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1090 -> e
-    116:116:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    117:117:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    117:117:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    117:117:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1090 -> e
-    117:117:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    118:118:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    118:118:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    118:118:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1090 -> e
-    118:118:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    119:119:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    119:119:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    119:119:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1090 -> e
-    119:119:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    120:120:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    120:120:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    120:120:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1090 -> e
-    120:120:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    121:121:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    121:121:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    121:121:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1090 -> e
-    121:121:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    122:122:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    122:122:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    122:122:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1090 -> e
-    122:122:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    53:56:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> e
-    53:56:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):604 -> e
-    53:56:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1090 -> e
-    53:56:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    57:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1096:1101 -> e
-    57:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    57:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    63:63:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    63:63:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1102 -> e
+    12:12:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> e
+    12:12:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):814 -> e
+    13:14:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1085:1086 -> e
+    13:14:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    15:15:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    15:15:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1087 -> e
+    15:15:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    16:23:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1087:1094 -> e
+    16:23:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    24:24:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    24:24:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1095 -> e
+    24:24:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    25:27:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1095:1097 -> e
+    25:27:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    28:28:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    28:28:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1098 -> e
+    28:28:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    29:35:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1098:1104 -> e
+    29:35:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    36:36:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    36:36:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    36:36:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1105 -> e
+    36:36:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    37:37:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):0:0 -> e
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":108,"2":109,"3":110,"4":111,"5":112,"6":113,"7":114}}
+    108:108:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    108:108:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    108:108:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1105 -> e
+    108:108:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    109:109:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    109:109:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    109:109:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1105 -> e
+    109:109:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    110:110:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    110:110:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    110:110:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1105 -> e
+    110:110:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    111:111:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    111:111:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    111:111:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1105 -> e
+    111:111:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    112:112:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    112:112:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    112:112:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1105 -> e
+    112:112:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    113:113:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    113:113:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    113:113:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1105 -> e
+    113:113:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    114:114:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    114:114:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    114:114:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1105 -> e
+    114:114:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    38:41:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    38:41:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    38:41:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1105 -> e
+    38:41:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    42:49:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1108:1115 -> e
+    42:49:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    50:50:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    50:50:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    50:50:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1116 -> e
+    50:50:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    51:51:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):0:0 -> e
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":115,"2":116,"3":117,"4":118,"5":119,"6":120,"7":121}}
+    115:115:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    115:115:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    115:115:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1116 -> e
+    115:115:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    116:116:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    116:116:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    116:116:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1116 -> e
+    116:116:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    117:117:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    117:117:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    117:117:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1116 -> e
+    117:117:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    118:118:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    118:118:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    118:118:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1116 -> e
+    118:118:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    119:119:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    119:119:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    119:119:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1116 -> e
+    119:119:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    120:120:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    120:120:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    120:120:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1116 -> e
+    120:120:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    121:121:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    121:121:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    121:121:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1116 -> e
+    121:121:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    52:55:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> e
+    52:55:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):635 -> e
+    52:55:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1116 -> e
+    52:55:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    56:61:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1122:1127 -> e
+    56:61:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    56:61:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    62:62:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    62:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1128 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    63:63:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    63:63:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    64:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1102:1103 -> e
-    64:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    64:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    66:66:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    66:66:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1104 -> e
+    62:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    62:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    63:64:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1128:1129 -> e
+    63:64:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    63:64:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    65:65:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    65:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1130 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    66:66:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    66:66:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    67:68:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1104:1105 -> e
-    67:68:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    67:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    69:69:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    69:69:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1106 -> e
+    65:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    65:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    66:67:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1130:1131 -> e
+    66:67:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    66:67:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    68:68:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    68:68:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1132 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    69:69:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    69:69:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    70:71:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1106:1107 -> e
-    70:71:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    70:71:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    72:72:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    72:72:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1108 -> e
+    68:68:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    68:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    69:70:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1132:1133 -> e
+    69:70:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    69:70:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    71:71:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    71:71:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1134 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    72:72:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    72:72:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    73:75:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1108:1110 -> e
-    73:75:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    73:75:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    76:76:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    76:76:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1111 -> e
+    71:71:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    71:71:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    72:74:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1134:1136 -> e
+    72:74:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    72:74:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    75:75:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    75:75:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1137 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    76:76:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    76:76:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    77:80:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1111:1114 -> e
-    77:80:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    77:80:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    81:81:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
-    81:81:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1115 -> e
+    75:75:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    75:75:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    76:79:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1137:1140 -> e
+    76:79:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    76:79:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    80:80:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> e
+    80:80:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1141 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    81:81:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    81:81:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    82:83:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1115:1116 -> e
-    82:83:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    82:83:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    84:84:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2252:2252 -> e
-    84:84:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1117 -> e
-    84:84:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    84:84:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    85:85:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):0:0 -> e
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":123,"2":124,"3":125,"4":126,"5":127}}
-    123:123:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2252:2252 -> e
-    123:123:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1117 -> e
-    123:123:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    123:123:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    124:124:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2252:2252 -> e
-    124:124:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1117 -> e
-    124:124:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    124:124:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    125:125:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2252:2252 -> e
-    125:125:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1117 -> e
-    125:125:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    125:125:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    126:126:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2252:2252 -> e
-    126:126:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1117 -> e
-    126:126:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    126:126:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    127:127:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2252:2252 -> e
-    127:127:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1117 -> e
-    127:127:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    127:127:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    86:88:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2252:2252 -> e
-    86:88:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1117 -> e
-    86:88:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    86:88:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    89:89:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1119:1119 -> e
-    89:89:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1092 -> e
-    89:89:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):797 -> e
-    90:90:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):798:798 -> e
-    91:91:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> e
-    91:91:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):799 -> e
-    92:97:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):799:804 -> e
-    98:101:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):803:806 -> e
-    102:102:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> e
-    102:102:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):807 -> e
-    103:106:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):807:810 -> e
-    107:107:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> e
-    107:107:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):811 -> e
-    108:108:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):812:812 -> e
-    128:133:java.lang.String acceptQuotedOrUnquotedString():1816:1821 -> e
-    1:3:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):615:617 -> f
+    80:80:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    80:80:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    81:82:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1141:1142 -> e
+    81:82:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    81:82:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    83:83:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2318:2318 -> e
+    83:83:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1143 -> e
+    83:83:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    83:83:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    84:84:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):0:0 -> e
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":122,"2":123,"3":124,"4":125,"5":126}}
+    122:122:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2318:2318 -> e
+    122:122:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1143 -> e
+    122:122:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    122:122:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    123:123:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2318:2318 -> e
+    123:123:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1143 -> e
+    123:123:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    123:123:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    124:124:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2318:2318 -> e
+    124:124:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1143 -> e
+    124:124:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    124:124:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    125:125:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2318:2318 -> e
+    125:125:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1143 -> e
+    125:125:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    125:125:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    126:126:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2318:2318 -> e
+    126:126:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1143 -> e
+    126:126:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    126:126:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    85:87:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2318:2318 -> e
+    85:87:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1143 -> e
+    85:87:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    85:87:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    88:88:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1145:1145 -> e
+    88:88:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1118 -> e
+    88:88:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):815 -> e
+    89:89:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> e
+    89:89:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):816 -> e
+    90:90:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> e
+    90:90:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):817 -> e
+    91:96:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):817:822 -> e
+    97:100:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):821:824 -> e
+    101:101:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> e
+    101:101:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):825 -> e
+    102:105:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):825:828 -> e
+    106:106:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> e
+    106:106:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):829 -> e
+    107:107:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):830:830 -> e
+    127:127:boolean lambda$parseFileFilter$2(int):1686:1686 -> e
+    128:133:java.lang.String acceptQuotedOrUnquotedString():1874:1879 -> e
+    1:3:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):646:648 -> f
     4:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):0:0 -> f
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":624,"2":625,"3":626,"4":627,"5":628}}
-    624:624:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):617:617 -> f
-    625:625:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):617:617 -> f
-    626:626:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):617:617 -> f
-    627:627:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):617:617 -> f
-    628:628:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):617:617 -> f
-    621:623:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):617:617 -> f
-    629:631:boolean skipOptionWithSingleArg(java.lang.String):712:714 -> f
-    632:633:void skipSingleArgument():786:787 -> f
-    632:633:boolean skipOptionWithSingleArg(java.lang.String):716 -> f
-    634:634:char readChar():1785:1785 -> f
-    634:634:void skipSingleArgument():788 -> f
-    634:634:boolean skipOptionWithSingleArg(java.lang.String):716 -> f
-    635:635:java.lang.String acceptString():1812:1812 -> f
-    1:1:boolean skipReturnValueAttribute(java.lang.String):753:753 -> g
-    2:2:boolean eof():1725:1725 -> g
-    3:6:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):2199:2202 -> g
-    1:4:void unacceptString(java.lang.String):2067:2070 -> h
-    5:5:com.android.tools.r8.position.TextPosition getPosition():2265:2265 -> h
-    6:6:int getColumn():2269:2269 -> h
-    6:6:com.android.tools.r8.position.TextPosition getPosition():2265 -> h
-    7:7:com.android.tools.r8.position.TextPosition getPosition():2265:2265 -> h
-    1:1:boolean isOptionalArgumentGiven():1747:1747 -> i
-    1:5:void parse():252:256 -> j
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":655,"2":656,"3":657,"4":658,"5":659}}
+    655:655:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):648:648 -> f
+    656:656:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):648:648 -> f
+    657:657:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):648:648 -> f
+    658:658:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):648:648 -> f
+    659:659:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):648:648 -> f
+    652:654:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):648:648 -> f
+    660:662:boolean skipOptionWithSingleArg(java.lang.String):730:732 -> f
+    663:664:void skipSingleArgument():804:805 -> f
+    663:664:boolean skipOptionWithSingleArg(java.lang.String):734 -> f
+    665:665:char readChar():1843:1843 -> f
+    665:665:void skipSingleArgument():806 -> f
+    665:665:boolean skipOptionWithSingleArg(java.lang.String):734 -> f
+    666:666:boolean lambda$skipOptimizationName$0(int):796:796 -> f
+    667:667:java.lang.String acceptString():1870:1870 -> f
+    1:1:boolean eof():1783:1783 -> g
+    2:5:void unacceptString(java.lang.String):2133:2136 -> g
+    6:9:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):2265:2268 -> g
+    1:1:com.android.tools.r8.position.TextPosition getPosition():2331:2331 -> h
+    2:2:int getColumn():2335:2335 -> h
+    2:2:com.android.tools.r8.position.TextPosition getPosition():2331 -> h
+    3:3:com.android.tools.r8.position.TextPosition getPosition():2331:2331 -> h
+    1:1:boolean isOptionalArgumentGiven():1805:1805 -> i
+    1:5:void parse():262:266 -> j
     6:6:void parse():0:0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":532,"2":533,"3":534}}
-    532:532:void parse():256:256 -> j
-    533:533:void parse():256:256 -> j
-    534:534:void parse():256:256 -> j
-    262:264:void parse():256:256 -> j
-    268:269:void parse():260:261 -> j
-    270:270:void parse():0:0 -> j
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":539,"2":540,"3":541}}
-    539:539:void parse():261:261 -> j
-    540:540:void parse():261:261 -> j
-    541:541:void parse():261:261 -> j
-    531:531:void parse():261:261 -> j
-    1:12:java.util.List parseArgumentList():1509:1520 -> k
-    13:13:java.util.List parseArgumentList():1517:1517 -> k
-    14:14:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2135:2135 -> k
-    14:14:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> k
-    14:14:java.util.List parseArgumentList():1522 -> k
-    15:16:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2128:2129 -> k
-    15:16:java.util.List parseArgumentList():1522 -> k
-    17:19:java.util.List parseArgumentList():1525:1525 -> k
-    21:21:java.util.List parseArgumentList():1527:1527 -> k
-    22:22:java.util.List parseArgumentList():1524:1524 -> k
-    23:23:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2135:2135 -> k
-    23:23:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> k
-    23:23:java.util.List parseArgumentList():1524 -> k
-    24:25:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2128:2129 -> k
-    24:25:java.util.List parseArgumentList():1524 -> k
-    26:26:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2137:2137 -> k
-    26:26:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> k
-    26:26:java.util.List parseArgumentList():1524 -> k
-    27:28:java.util.List parseArgumentList():1530:1531 -> k
-    29:29:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2137:2137 -> k
-    29:29:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2127 -> k
-    29:29:java.util.List parseArgumentList():1522 -> k
-    1:7:java.lang.String parseFileFilter():1646:1652 -> l
-    1:1:boolean parseIgnoredReturnValueAttribute():655:655 -> m
-    2:2:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> m
-    2:2:boolean parseIgnoredReturnValueAttribute():655 -> m
-    1:3:boolean parseIgnoredReturnValueAttributes():660:662 -> n
-    1:2:void parseInclude():668:669 -> o
-    3:4:java.nio.file.Path parseFileInputDependency(java.util.function.BiConsumer):1572:1573 -> o
-    3:4:void parseInclude():669 -> o
-    5:6:void parseInclude():671:672 -> o
-    7:7:void parseInclude():0:0 -> o
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1372,"2":1373,"3":1374}}
-    1372:1372:void parseInclude():677:677 -> o
-    1373:1373:void parseInclude():677:677 -> o
-    1374:1374:void parseInclude():677:677 -> o
-    684:684:void parseInclude():677:677 -> o
-    685:686:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2217:2218 -> o
-    685:686:void parseInclude():677 -> o
-    687:688: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 -> o
-    687:688:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2218 -> o
-    687:688:void parseInclude():677 -> o
-    689:689:void parseInclude():677:677 -> o
-    690:690:void parseInclude():0:0 -> o
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1375,"2":1376,"3":1377}}
-    1375:1375:void parseInclude():674:674 -> o
-    1376:1376:void parseInclude():674:674 -> o
-    1377:1377:void parseInclude():674:674 -> o
-    1364:1364:void parseInclude():674:674 -> o
-    1365:1366:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2217:2218 -> o
-    1365:1366:void parseInclude():674 -> o
-    1367:1368: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 -> o
-    1367:1368:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2218 -> o
-    1367:1368:void parseInclude():674 -> o
-    1369:1369:void parseInclude():674:674 -> o
-    1:1:boolean parseOption():265:265 -> p
-    2:2:int remainingChars():1789:1789 -> p
-    2:2:boolean acceptArobaseInclude():683 -> p
-    2:2:boolean parseOption():268 -> p
-    3:6:boolean acceptArobaseInclude():686:689 -> p
-    3:6:boolean parseOption():268 -> p
-    7:10:boolean parseOption():271:274 -> p
-    11:12:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):477:478 -> p
-    11:12:boolean parseOption():275 -> p
-    13:13:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1672:1672 -> p
-    13:13:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):480 -> p
-    13:13:boolean parseOption():275 -> p
-    14:14:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule.builder():75:75 -> p
-    14:14:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1672 -> p
-    14:14:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):480 -> p
-    14:14:boolean parseOption():275 -> p
-    15:15:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1672:1672 -> p
-    15:15:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):480 -> p
-    15:15:boolean parseOption():275 -> p
-    16:16:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    16:16:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1672 -> p
-    16:16:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):480 -> p
-    16:16:boolean parseOption():275 -> p
-    17:17:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    17:17:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1672 -> p
-    17:17:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):480 -> p
-    17:17:boolean parseOption():275 -> p
-    18:20:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1673:1675 -> p
-    18:20:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):480 -> p
-    18:20:boolean parseOption():275 -> p
-    21:21:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    21:21:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1676 -> p
-    21:21:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):480 -> p
-    21:21:boolean parseOption():275 -> p
-    22:32:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder.build():26:36 -> p
-    22:32:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1677 -> p
-    22:32:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):480 -> p
-    22:32:boolean parseOption():275 -> p
-    33:38:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):481:486 -> p
-    33:38:boolean parseOption():275 -> p
-    39:39:com.android.tools.r8.shaking.KeepConstantArgumentRule$Builder com.android.tools.r8.shaking.KeepConstantArgumentRule.builder():76:76 -> p
-    39:39:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):486 -> p
-    39:39:boolean parseOption():275 -> p
-    40:46:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):486:492 -> p
-    40:46:boolean parseOption():275 -> p
-    47:47:com.android.tools.r8.shaking.KeepUnusedArgumentRule$Builder com.android.tools.r8.shaking.KeepUnusedArgumentRule.builder():76:76 -> p
-    47:47:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):492 -> p
-    47:47:boolean parseOption():275 -> p
-    48:54:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):492:498 -> p
-    48:54:boolean parseOption():275 -> p
-    55:55:com.android.tools.r8.shaking.KeepUnusedReturnValueRule$Builder com.android.tools.r8.shaking.KeepUnusedReturnValueRule.builder():77:77 -> p
-    55:55:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):498 -> p
-    55:55:boolean parseOption():275 -> p
-    56:80:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):498:522 -> p
-    56:80:boolean parseOption():275 -> p
-    81:81:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):853:853 -> p
-    81:81:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):523 -> p
-    81:81:boolean parseOption():275 -> p
-    82:82:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$Builder com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule.builder():77:77 -> p
-    82:82:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):853 -> p
-    82:82:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):523 -> p
-    82:82:boolean parseOption():275 -> p
-    83:83:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):853:853 -> p
-    83:83:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):523 -> p
-    83:83:boolean parseOption():275 -> p
-    84:84:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    84:84:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):853 -> p
-    84:84:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):523 -> p
-    84:84:boolean parseOption():275 -> p
-    85:85:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    85:85:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):853 -> p
-    85:85:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):523 -> p
-    85:85:boolean parseOption():275 -> p
-    86:88:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):854:856 -> p
-    86:88:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):523 -> p
-    86:88:boolean parseOption():275 -> p
-    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 -> p
-    89:89:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):857 -> p
-    89:89:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):523 -> p
-    89:89:boolean parseOption():275 -> p
-    90:100:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$Builder.build():29:39 -> p
-    90:100:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):858 -> p
-    90:100:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):523 -> p
-    90:100:boolean parseOption():275 -> p
-    101:104:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):524:527 -> p
-    101:104:boolean parseOption():275 -> p
-    105:105:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):864:864 -> p
-    105:105:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):528 -> p
-    105:105:boolean parseOption():275 -> p
-    106:106:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule.builder():76:76 -> p
-    106:106:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):864 -> p
-    106:106:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):528 -> p
-    106:106:boolean parseOption():275 -> p
-    107:107:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):864:864 -> p
-    107:107:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):528 -> p
-    107:107:boolean parseOption():275 -> p
-    108:108:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    108:108:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):864 -> p
-    108:108:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):528 -> p
-    108:108:boolean parseOption():275 -> p
-    109:109:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    109:109:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):864 -> p
-    109:109:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):528 -> p
-    109:109:boolean parseOption():275 -> p
-    110:112:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):865:867 -> p
-    110:112:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):528 -> p
-    110:112:boolean parseOption():275 -> p
-    113:113:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    113:113:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):868 -> p
-    113:113:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):528 -> p
-    113:113:boolean parseOption():275 -> p
-    114:124:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder.build():28:38 -> p
-    114:124:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):869 -> p
-    114:124:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):528 -> p
-    114:124:boolean parseOption():275 -> p
-    125:128:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):529:532 -> p
-    125:128:boolean parseOption():275 -> p
-    129:129:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):875:875 -> p
-    129:129:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):533 -> p
-    129:129:boolean parseOption():275 -> p
-    130:130:com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder com.android.tools.r8.shaking.NoVerticalClassMergingRule.builder():76:76 -> p
-    130:130:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):875 -> p
-    130:130:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):533 -> p
-    130:130:boolean parseOption():275 -> p
-    131:131:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):875:875 -> p
-    131:131:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):533 -> p
-    131:131:boolean parseOption():275 -> p
-    132:132:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    132:132:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):875 -> p
-    132:132:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):533 -> p
-    132:132:boolean parseOption():275 -> p
-    133:133:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    133:133:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):875 -> p
-    133:133:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):533 -> p
-    133:133:boolean parseOption():275 -> p
-    134:136:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):876:878 -> p
-    134:136:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):533 -> p
-    134:136:boolean parseOption():275 -> p
-    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 -> p
-    137:137:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):879 -> p
-    137:137:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):533 -> p
-    137:137:boolean parseOption():275 -> p
-    138:148:com.android.tools.r8.shaking.NoVerticalClassMergingRule com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder.build():28:38 -> p
-    138:148:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):880 -> p
-    138:148:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):533 -> p
-    138:148:boolean parseOption():275 -> p
-    149:152:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):534:537 -> p
-    149:152:boolean parseOption():275 -> p
-    153:153:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):886:886 -> p
-    153:153:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):538 -> p
-    153:153:boolean parseOption():275 -> p
-    154:154:com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder com.android.tools.r8.shaking.NoHorizontalClassMergingRule.builder():77:77 -> p
-    154:154:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):886 -> p
-    154:154:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):538 -> p
-    154:154:boolean parseOption():275 -> p
-    155:155:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):886:886 -> p
-    155:155:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):538 -> p
-    155:155:boolean parseOption():275 -> p
-    156:156:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    156:156:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):886 -> p
-    156:156:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):538 -> p
-    156:156:boolean parseOption():275 -> p
-    157:157:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    157:157:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):886 -> p
-    157:157:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):538 -> p
-    157:157:boolean parseOption():275 -> p
-    158:160:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):887:889 -> p
-    158:160:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):538 -> p
-    158:160:boolean parseOption():275 -> p
-    161:161:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    161:161:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):890 -> p
-    161:161:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):538 -> p
-    161:161:boolean parseOption():275 -> p
-    162:172:com.android.tools.r8.shaking.NoHorizontalClassMergingRule com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder.build():29:39 -> p
-    162:172:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):891 -> p
-    162:172:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):538 -> p
-    162:172:boolean parseOption():275 -> p
-    173:178:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):539:544 -> p
-    173:178:boolean parseOption():275 -> p
-    179:179:com.android.tools.r8.shaking.NoMethodStaticizingRule$Builder com.android.tools.r8.shaking.NoMethodStaticizingRule.builder():77:77 -> p
-    179:179:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):544 -> p
-    179:179:boolean parseOption():275 -> p
-    180:186:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):544:550 -> p
-    180:186:boolean parseOption():275 -> p
-    187:187:com.android.tools.r8.shaking.NoParameterReorderingRule$Builder com.android.tools.r8.shaking.NoParameterReorderingRule.builder():77:77 -> p
-    187:187:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550 -> p
-    187:187:boolean parseOption():275 -> p
-    188:194:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):550:556 -> p
-    188:194:boolean parseOption():275 -> p
-    195:195:com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule$Builder com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule.builder():78:78 -> p
-    195:195:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):556 -> p
-    195:195:boolean parseOption():275 -> p
-    196:202:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):556:562 -> p
-    196:202:boolean parseOption():275 -> p
-    203:203:com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule$Builder com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule.builder():78:78 -> p
-    203:203:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):562 -> p
-    203:203:boolean parseOption():275 -> p
-    204:208:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):562:566 -> p
-    204:208:boolean parseOption():275 -> p
-    209:209:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):908:908 -> p
-    209:209:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):568 -> p
-    209:209:boolean parseOption():275 -> p
-    210:210:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule.builder():91:91 -> p
-    210:210:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):908 -> p
-    210:210:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):568 -> p
-    210:210:boolean parseOption():275 -> p
-    211:211:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):908:908 -> p
-    211:211:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):568 -> p
-    211:211:boolean parseOption():275 -> p
-    212:212:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    212:212:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):908 -> p
-    212:212:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):568 -> p
-    212:212:boolean parseOption():275 -> p
-    213:213:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    213:213:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):908 -> p
-    213:213:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):568 -> p
-    213:213:boolean parseOption():275 -> p
-    214:214:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.setType(com.android.tools.r8.shaking.MemberValuePropagationRule$Type):32:32 -> p
-    214:214:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):908 -> p
-    214:214:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):568 -> p
-    214:214:boolean parseOption():275 -> p
-    215:217:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):909:911 -> p
-    215:217:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):568 -> p
-    215:217:boolean parseOption():275 -> p
-    218:218:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    218:218:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):912 -> p
-    218:218:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):568 -> p
-    218:218:boolean parseOption():275 -> p
-    219:229:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:48 -> p
-    219:229:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):913 -> p
-    219:229:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):568 -> p
-    219:229:boolean parseOption():275 -> p
-    230:234:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569:573 -> p
-    230:234:boolean parseOption():275 -> p
-    235:235:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992:992 -> p
-    235:235:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> p
-    235:235:boolean parseOption():275 -> p
-    236:236:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder com.android.tools.r8.shaking.ReprocessClassInitializerRule.builder():92:92 -> p
-    236:236:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992 -> p
-    236:236:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> p
-    236:236:boolean parseOption():275 -> p
-    237:237:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992:992 -> p
-    237:237:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> p
-    237:237:boolean parseOption():275 -> p
-    238:238:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    238:238:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992 -> p
-    238:238:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> p
-    238:238:boolean parseOption():275 -> p
-    239:239:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    239:239:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992 -> p
-    239:239:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> p
-    239:239:boolean parseOption():275 -> p
-    240:243:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992:995 -> p
-    240:243:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> p
-    240:243:boolean parseOption():275 -> p
-    244:244:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    244:244:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):996 -> p
-    244:244:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> p
-    244:244:boolean parseOption():275 -> p
-    245:245:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):997:997 -> p
-    245:245:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> p
-    245:245:boolean parseOption():275 -> p
-    246:252:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):573:579 -> p
-    246:252:boolean parseOption():275 -> p
-    253:253:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003:1003 -> p
-    253:253:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):580 -> p
-    253:253:boolean parseOption():275 -> p
-    254:254:com.android.tools.r8.shaking.ReprocessMethodRule$Builder com.android.tools.r8.shaking.ReprocessMethodRule.builder():92:92 -> p
-    254:254:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003 -> p
-    254:254:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):580 -> p
-    254:254:boolean parseOption():275 -> p
-    255:255:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003:1003 -> p
-    255:255:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):580 -> p
-    255:255:boolean parseOption():275 -> p
-    256:256:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    256:256:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003 -> p
-    256:256:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):580 -> p
-    256:256:boolean parseOption():275 -> p
-    257:257:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    257:257:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003 -> p
-    257:257:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):580 -> p
-    257:257:boolean parseOption():275 -> p
-    258:261:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003:1006 -> p
-    258:261:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):580 -> p
-    258:261:boolean parseOption():275 -> p
-    262:262:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    262:262:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1007 -> p
-    262:262:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):580 -> p
-    262:262:boolean parseOption():275 -> p
-    263:263:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1008:1008 -> p
-    263:263:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):580 -> p
-    263:263:boolean parseOption():275 -> p
-    264:269:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):579:584 -> p
-    264:269:boolean parseOption():275 -> p
-    270:270:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992:992 -> p
-    270:270:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):585 -> p
-    270:270:boolean parseOption():275 -> p
-    271:271:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder com.android.tools.r8.shaking.ReprocessClassInitializerRule.builder():92:92 -> p
-    271:271:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992 -> p
-    271:271:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):585 -> p
-    271:271:boolean parseOption():275 -> p
-    272:272:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992:992 -> p
-    272:272:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):585 -> p
-    272:272:boolean parseOption():275 -> p
-    273:273:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    273:273:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992 -> p
-    273:273:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):585 -> p
-    273:273:boolean parseOption():275 -> p
-    274:274:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    274:274:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992 -> p
-    274:274:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):585 -> p
-    274:274:boolean parseOption():275 -> p
-    275:278:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):992:995 -> p
-    275:278:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):585 -> p
-    275:278:boolean parseOption():275 -> p
-    279:279:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    279:279:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):996 -> p
-    279:279:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):585 -> p
-    279:279:boolean parseOption():275 -> p
-    280:280:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):997:997 -> p
-    280:280:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):585 -> p
-    280:280:boolean parseOption():275 -> p
-    281:287:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):584:590 -> p
-    281:287:boolean parseOption():275 -> p
-    288:288:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003:1003 -> p
-    288:288:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):591 -> p
-    288:288:boolean parseOption():275 -> p
-    289:289:com.android.tools.r8.shaking.ReprocessMethodRule$Builder com.android.tools.r8.shaking.ReprocessMethodRule.builder():92:92 -> p
-    289:289:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003 -> p
-    289:289:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):591 -> p
-    289:289:boolean parseOption():275 -> p
-    290:290:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003:1003 -> p
-    290:290:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):591 -> p
-    290:290:boolean parseOption():275 -> p
-    291:291:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    291:291:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003 -> p
-    291:291:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):591 -> p
-    291:291:boolean parseOption():275 -> p
-    292:292:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    292:292:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003 -> p
-    292:292:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):591 -> p
-    292:292:boolean parseOption():275 -> p
-    293:296:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1003:1006 -> p
-    293:296:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):591 -> p
-    293:296:boolean parseOption():275 -> p
-    297:297:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    297:297:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1007 -> p
-    297:297:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):591 -> p
-    297:297:boolean parseOption():275 -> p
-    298:298:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1008:1008 -> p
-    298:298:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):591 -> p
-    298:298:boolean parseOption():275 -> p
-    299:303:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):590:594 -> p
-    299:303:boolean parseOption():275 -> p
-    304:304:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1014:1014 -> p
-    304:304:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):595 -> p
-    304:304:boolean parseOption():275 -> p
-    305:305:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder com.android.tools.r8.shaking.WhyAreYouNotInliningRule.builder():74:74 -> p
-    305:305:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1014 -> p
-    305:305:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):595 -> p
-    305:305:boolean parseOption():275 -> p
-    306:306:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1014:1014 -> p
-    306:306:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):595 -> p
-    306:306:boolean parseOption():275 -> p
-    307:308:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
-    307:308:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1014 -> p
-    307:308:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):595 -> p
-    307:308:boolean parseOption():275 -> p
-    309:309:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1014:1014 -> p
-    309:309:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):595 -> p
-    309:309:boolean parseOption():275 -> p
-    310:311:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
-    310:311:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1014 -> p
-    310:311:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):595 -> p
-    310:311:boolean parseOption():275 -> p
-    312:315:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1014:1017 -> p
-    312:315:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):595 -> p
-    312:315:boolean parseOption():275 -> p
-    316:316:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    316:316:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1018 -> p
-    316:316:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):595 -> p
-    316:316:boolean parseOption():275 -> p
-    317:327:com.android.tools.r8.shaking.WhyAreYouNotInliningRule com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder.build():26:36 -> p
-    317:327:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1019 -> p
-    317:327:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):595 -> p
-    317:327:boolean parseOption():275 -> p
-    328:328:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):596:596 -> p
-    328:328:boolean parseOption():275 -> p
-    329:336:boolean parseOption():276:283 -> p
-    337:349:boolean parseOption():279:291 -> p
-    350:377:java.util.List acceptPatternList():2007:2034 -> p
-    350:377:void parseKeepAttributes():694 -> p
-    350:377:boolean parseOption():292 -> p
-    378:381:void parseKeepAttributes():695:698 -> p
-    378:381:boolean parseOption():292 -> p
-    382:382:void parseKeepAttributes():696:696 -> p
-    382:382:boolean parseOption():292 -> p
-    383:384:boolean parseOption():293:294 -> p
-    385:394:void parsePackageFilter(java.util.function.BiConsumer):2076:2085 -> p
-    385:394:boolean parseOption():294 -> p
-    395:398:void parsePackageFilter(java.util.function.BiConsumer):2084:2087 -> p
-    395:398:boolean parseOption():294 -> p
-    399:406:void parsePackageFilter(java.util.function.BiConsumer):2082:2089 -> p
-    399:406:boolean parseOption():294 -> p
-    407:417:boolean parseOption():295:305 -> p
-    418:422:void parsePathFilter(java.util.function.Consumer):2148:2152 -> p
-    418:422:boolean parseOption():305 -> p
-    423:426:boolean parseOption():306:309 -> p
-    427:427:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):817:817 -> p
-    427:427:boolean parseOption():310 -> p
-    428:428:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule.builder():74:74 -> p
-    428:428:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):817 -> p
-    428:428:boolean parseOption():310 -> p
-    429:429:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):817:817 -> p
-    429:429:boolean parseOption():310 -> p
-    430:430:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> p
-    430:430:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):818 -> p
-    430:430:boolean parseOption():310 -> p
-    431:431:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> p
-    431:431:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):819 -> p
-    431:431:boolean parseOption():310 -> p
-    432:434:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):820:822 -> p
-    432:434:boolean parseOption():310 -> p
-    435:435:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    435:435:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):823 -> p
-    435:435:boolean parseOption():310 -> p
-    436:446:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:36 -> p
-    436:446:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):824 -> p
-    436:446:boolean parseOption():310 -> p
-    447:452:boolean parseOption():311:316 -> p
-    453:453:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> p
-    453:453:boolean parseOption():321 -> p
-    454:454:boolean parseOption():0:0 -> p
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":961,"2":962,"3":963,"4":964,"5":965}}
-    961:961:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> p
-    961:961:boolean parseOption():321 -> p
-    962:962:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> p
-    962:962:boolean parseOption():321 -> p
-    963:963:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> p
-    963:963:boolean parseOption():321 -> p
-    964:964:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> p
-    964:964:boolean parseOption():321 -> p
-    965:965:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> p
-    965:965:boolean parseOption():321 -> p
-    455:457:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2227:2227 -> p
-    455:457:boolean parseOption():321 -> p
-    458:460:boolean parseOption():318:318 -> p
-    464:481:boolean parseOption():322:339 -> p
-    482:483:void parseClassFilter(java.util.function.Consumer):2095:2096 -> p
-    482:483:boolean parseOption():339 -> p
-    484:484:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2114:2114 -> p
-    484:484:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    484:484:boolean parseOption():339 -> p
-    485:485:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2135:2135 -> p
-    485:485:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2106 -> p
-    485:485:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    485:485:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    485:485:boolean parseOption():339 -> p
-    486:489:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2107:2107 -> p
-    486:489:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    486:489:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    486:489:boolean parseOption():339 -> p
-    492:492:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2110:2110 -> p
-    492:492:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    492:492:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    492:492:boolean parseOption():339 -> p
-    493:494:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2117:2118 -> p
-    493:494:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    493:494:boolean parseOption():339 -> p
-    495:495:void parseClassFilter(java.util.function.Consumer):2097:2097 -> p
-    495:495:boolean parseOption():339 -> p
-    496:496:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2137:2137 -> p
-    496:496:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2106 -> p
-    496:496:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    496:496:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    496:496:boolean parseOption():339 -> p
-    497:497:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> p
-    497:497:void parseClassFilter(java.util.function.Consumer):2100 -> p
-    497:497:boolean parseOption():339 -> p
-    498:498:void parseClassFilter(java.util.function.Consumer):2100:2100 -> p
-    498:498:boolean parseOption():339 -> p
-    499:499:void parseClassFilter(java.util.function.Consumer):2099:2099 -> p
-    499:499:boolean parseOption():339 -> p
-    500:501:boolean parseOption():340:341 -> p
-    502:503:void parseClassFilter(java.util.function.Consumer):2095:2096 -> p
-    502:503:boolean parseOption():341 -> p
-    504:504:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2114:2114 -> p
-    504:504:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    504:504:boolean parseOption():341 -> p
-    505:505:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2135:2135 -> p
-    505:505:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2106 -> p
-    505:505:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    505:505:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    505:505:boolean parseOption():341 -> p
-    506:509:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2107:2107 -> p
-    506:509:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    506:509:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    506:509:boolean parseOption():341 -> p
-    512:512:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2110:2110 -> p
-    512:512:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    512:512:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    512:512:boolean parseOption():341 -> p
-    513:514:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2117:2118 -> p
-    513:514:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    513:514:boolean parseOption():341 -> p
-    515:515:void parseClassFilter(java.util.function.Consumer):2097:2097 -> p
-    515:515:boolean parseOption():341 -> p
-    516:516:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2137:2137 -> p
-    516:516:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2106 -> p
-    516:516:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    516:516:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    516:516:boolean parseOption():341 -> p
-    517:517:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> p
-    517:517:void parseClassFilter(java.util.function.Consumer):2100 -> p
-    517:517:boolean parseOption():341 -> p
-    518:518:void parseClassFilter(java.util.function.Consumer):2100:2100 -> p
-    518:518:boolean parseOption():341 -> p
-    519:519:void parseClassFilter(java.util.function.Consumer):2099:2099 -> p
-    519:519:boolean parseOption():341 -> p
-    520:521:boolean parseOption():342:343 -> p
-    522:522:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    522:522:boolean parseOption():344 -> p
-    523:523:boolean parseOption():0:0 -> p
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":966,"2":967,"3":968,"4":969,"5":970,"6":971,"7":972}}
-    966:966:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    966:966:boolean parseOption():344 -> p
-    967:967:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    967:967:boolean parseOption():344 -> p
-    968:968:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    968:968:boolean parseOption():344 -> p
-    969:969:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    969:969:boolean parseOption():344 -> p
-    970:970:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    970:970:boolean parseOption():344 -> p
-    971:971:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    971:971:boolean parseOption():344 -> p
-    972:972:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    972:972:boolean parseOption():344 -> p
-    524:526:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    524:526:boolean parseOption():344 -> p
-    527:530:boolean parseOption():346:349 -> p
-    531:532:java.lang.String parsePackageNameOrEmptyString():2122:2123 -> p
-    531:532:boolean parseOption():349 -> p
-    533:539:boolean parseOption():349:355 -> p
-    540:541:java.lang.String parsePackageNameOrEmptyString():2122:2123 -> p
-    540:541:boolean parseOption():355 -> p
-    542:546:boolean parseOption():355:359 -> p
-    547:547:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    547:547:boolean parseOption():360 -> p
-    548:548:boolean parseOption():0:0 -> p
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":973,"2":974,"3":975,"4":976,"5":977,"6":978,"7":979}}
-    973:973:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    973:973:boolean parseOption():360 -> p
-    974:974:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    974:974:boolean parseOption():360 -> p
-    975:975:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    975:975:boolean parseOption():360 -> p
-    976:976:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    976:976:boolean parseOption():360 -> p
-    977:977:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    977:977:boolean parseOption():360 -> p
-    978:978:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    978:978:boolean parseOption():360 -> p
-    979:979:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    979:979:boolean parseOption():360 -> p
-    549:551:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2237:2237 -> p
-    549:551:boolean parseOption():360 -> p
-    552:553:boolean parseOption():361:362 -> p
-    554:555:void skipSingleArgument():786:787 -> p
-    554:555:boolean parseOption():363 -> p
-    556:556:char readChar():1785:1785 -> p
-    556:556:void skipSingleArgument():788 -> p
-    556:556:boolean parseOption():363 -> p
-    557:560:boolean parseOption():366:369 -> p
-    561:562:java.lang.String parsePackageNameOrEmptyString():2122:2123 -> p
-    561:562:boolean parseOption():369 -> p
-    563:569:boolean parseOption():369:375 -> p
-    570:571:java.lang.String parsePackageNameOrEmptyString():2122:2123 -> p
-    570:571:boolean parseOption():375 -> p
-    572:594:boolean parseOption():375:397 -> p
-    595:596:java.nio.file.Path parseFileInputDependency(java.util.function.BiConsumer):1572:1573 -> p
-    595:596:boolean parseOption():397 -> p
-    597:599:boolean parseOption():396:398 -> p
-    600:600:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1659:1659 -> p
-    600:600:boolean parseOption():399 -> p
-    601:601:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule.builder():77:77 -> p
-    601:601:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1659 -> p
-    601:601:boolean parseOption():399 -> p
-    602:602:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1659:1659 -> p
-    602:602:boolean parseOption():399 -> p
-    603:604:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
-    603:604:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1660 -> p
-    603:604:boolean parseOption():399 -> p
-    605:605:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1660:1660 -> p
-    605:605:boolean parseOption():399 -> p
-    606:607:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
-    606:607:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1661 -> p
-    606:607:boolean parseOption():399 -> p
-    608:611:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1661:1664 -> p
-    608:611:boolean parseOption():399 -> p
-    612:612:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    612:612:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1665 -> p
-    612:612:boolean parseOption():399 -> p
-    613:623:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder.build():26:36 -> p
-    613:623:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1666 -> p
-    613:623:boolean parseOption():399 -> p
-    624:625:boolean parseOption():400:401 -> p
-    626:626:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1682:1682 -> p
-    626:626:boolean parseOption():402 -> p
-    627:627:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder com.android.tools.r8.shaking.ProguardAssumeValuesRule.builder():77:77 -> p
-    627:627:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1682 -> p
-    627:627:boolean parseOption():402 -> p
-    628:628:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1682:1682 -> p
-    628:628:boolean parseOption():402 -> p
-    629:630:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
-    629:630:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1683 -> p
-    629:630:boolean parseOption():402 -> p
-    631:631:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1683:1683 -> p
-    631:631:boolean parseOption():402 -> p
-    632:633:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
-    632:633:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1684 -> p
-    632:633:boolean parseOption():402 -> p
-    634:637:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1684:1687 -> p
-    634:637:boolean parseOption():402 -> p
-    638:638:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    638:638:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1688 -> p
-    638:638:boolean parseOption():402 -> p
-    639:649:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:36 -> p
-    639:649:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1689 -> p
-    639:649:boolean parseOption():402 -> p
-    650:654:boolean parseOption():403:407 -> p
-    655:665:boolean parseOption():406:416 -> p
-    666:670:java.util.List parseClassPath(java.util.function.BiConsumer):1609:1613 -> p
-    666:670:boolean parseOption():416 -> p
-    671:684:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1626:1639 -> p
-    671:684:java.util.List parseClassPath(java.util.function.BiConsumer):1614 -> p
-    671:684:boolean parseOption():416 -> p
-    685:690:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1636:1641 -> p
-    685:690:java.util.List parseClassPath(java.util.function.BiConsumer):1614 -> p
-    685:690:boolean parseOption():416 -> p
-    691:694:java.util.List parseClassPath(java.util.function.BiConsumer):1615:1618 -> p
-    691:694:boolean parseOption():416 -> p
-    695:708:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1626:1639 -> p
-    695:708:java.util.List parseClassPath(java.util.function.BiConsumer):1619 -> p
-    695:708:boolean parseOption():416 -> p
-    709:714:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1636:1641 -> p
-    709:714:java.util.List parseClassPath(java.util.function.BiConsumer):1619 -> p
-    709:714:boolean parseOption():416 -> p
-    715:715:java.util.List parseClassPath(java.util.function.BiConsumer):1620:1620 -> p
-    715:715:boolean parseOption():416 -> p
-    716:720:boolean parseOption():415:419 -> p
-    721:725:java.util.List parseClassPath(java.util.function.BiConsumer):1609:1613 -> p
-    721:725:boolean parseOption():419 -> p
-    726:739:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1626:1639 -> p
-    726:739:java.util.List parseClassPath(java.util.function.BiConsumer):1614 -> p
-    726:739:boolean parseOption():419 -> p
-    740:745:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1636:1641 -> p
-    740:745:java.util.List parseClassPath(java.util.function.BiConsumer):1614 -> p
-    740:745:boolean parseOption():419 -> p
-    746:749:java.util.List parseClassPath(java.util.function.BiConsumer):1615:1618 -> p
-    746:749:boolean parseOption():419 -> p
-    750:763:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1626:1639 -> p
-    750:763:java.util.List parseClassPath(java.util.function.BiConsumer):1619 -> p
-    750:763:boolean parseOption():419 -> p
-    764:769:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1636:1641 -> p
-    764:769:java.util.List parseClassPath(java.util.function.BiConsumer):1619 -> p
-    764:769:boolean parseOption():419 -> p
-    770:770:java.util.List parseClassPath(java.util.function.BiConsumer):1620:1620 -> p
-    770:770:boolean parseOption():419 -> p
-    771:781:boolean parseOption():418:428 -> p
-    782:783:java.nio.file.Path parseFileInputDependency(java.util.function.BiConsumer):1572:1573 -> p
-    782:783:boolean parseOption():428 -> p
-    784:789:boolean parseOption():427:432 -> p
-    790:791:java.nio.file.Path parseFileInputDependency(java.util.function.BiConsumer):1572:1573 -> p
-    790:791:boolean parseOption():431 -> p
-    792:798:boolean parseOption():430:436 -> p
-    799:800:java.nio.file.Path parseFileInputDependency(java.util.function.BiConsumer):1572:1573 -> p
-    799:800:boolean parseOption():435 -> p
-    801:808:boolean parseOption():434:441 -> p
-    809:810:void parseClassFilter(java.util.function.Consumer):2095:2096 -> p
-    809:810:boolean parseOption():441 -> p
-    811:811:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2114:2114 -> p
-    811:811:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    811:811:boolean parseOption():441 -> p
-    812:812:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2135:2135 -> p
-    812:812:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2106 -> p
-    812:812:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    812:812:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    812:812:boolean parseOption():441 -> p
-    813:816:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2107:2107 -> p
-    813:816:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    813:816:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    813:816:boolean parseOption():441 -> p
-    819:819:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2110:2110 -> p
-    819:819:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    819:819:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    819:819:boolean parseOption():441 -> p
-    820:821:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2117:2118 -> p
-    820:821:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    820:821:boolean parseOption():441 -> p
-    822:822:void parseClassFilter(java.util.function.Consumer):2097:2097 -> p
-    822:822:boolean parseOption():441 -> p
-    823:823:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2137:2137 -> p
-    823:823:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2106 -> p
-    823:823:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2116 -> p
-    823:823:void parseClassFilter(java.util.function.Consumer):2097 -> p
-    823:823:boolean parseOption():441 -> p
-    824:824:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> p
-    824:824:void parseClassFilter(java.util.function.Consumer):2100 -> p
-    824:824:boolean parseOption():441 -> p
-    825:825:void parseClassFilter(java.util.function.Consumer):2100:2100 -> p
-    825:825:boolean parseOption():441 -> p
-    826:826:void parseClassFilter(java.util.function.Consumer):2099:2099 -> p
-    826:826:boolean parseOption():441 -> p
-    827:828:boolean parseOption():442:443 -> p
-    829:833:void parsePathFilter(java.util.function.Consumer):2148:2152 -> p
-    829:833:boolean parseOption():443 -> p
-    834:835:boolean parseOption():444:445 -> p
-    836:840:void parsePathFilter(java.util.function.Consumer):2148:2152 -> p
-    836:840:boolean parseOption():445 -> p
-    841:842:boolean parseOption():446:447 -> p
-    843:843:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):932:932 -> p
-    843:843:boolean parseOption():447 -> p
-    844:844:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder com.android.tools.r8.shaking.ProguardIdentifierNameStringRule.builder():73:73 -> p
-    844:844:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):932 -> p
-    844:844:boolean parseOption():447 -> p
-    845:845:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):932:932 -> p
-    845:845:boolean parseOption():447 -> p
-    846:847:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
-    846:847:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):933 -> p
-    846:847:boolean parseOption():447 -> p
-    848:848:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):933:933 -> p
-    848:848:boolean parseOption():447 -> p
-    849:850:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
-    849:850:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):934 -> p
-    849:850:boolean parseOption():447 -> p
-    851:854:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):934:937 -> p
-    851:854:boolean parseOption():447 -> p
-    855:855:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    855:855:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):938 -> p
-    855:855:boolean parseOption():447 -> p
-    856:866:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:35 -> p
-    856:866:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):939 -> p
-    856:866:boolean parseOption():447 -> p
-    867:869:boolean parseOption():447:449 -> p
-    870:870:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):944:944 -> p
-    870:870:boolean parseOption():449 -> p
-    871:871:com.android.tools.r8.shaking.ProguardIfRule$Builder com.android.tools.r8.shaking.ProguardIfRule.builder():136:136 -> p
-    871:871:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):944 -> p
-    871:871:boolean parseOption():449 -> p
-    872:872:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):944:944 -> p
-    872:872:boolean parseOption():449 -> p
-    873:874:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> p
-    873:874:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):945 -> p
-    873:874:boolean parseOption():449 -> p
-    875:875:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):945:945 -> p
-    875:875:boolean parseOption():449 -> p
-    876:877:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> p
-    876:877:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):946 -> p
-    876:877:boolean parseOption():449 -> p
-    878:885:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):946:953 -> p
-    878:885:boolean parseOption():449 -> p
-    886:886:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):74:74 -> p
-    886:886:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):954 -> p
-    886:886:boolean parseOption():449 -> p
-    887:888:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):955:956 -> p
-    887:888:boolean parseOption():449 -> p
-    889:889:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> p
-    889:889:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):957 -> p
-    889:889:boolean parseOption():449 -> p
-    890:901:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():79:90 -> p
-    890:901:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):958 -> p
-    890:901:boolean parseOption():449 -> p
-    902:902:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):959:959 -> p
-    902:902:boolean parseOption():449 -> p
-    903:915:void verifyAndLinkBackReferences(java.lang.Iterable):1023:1035 -> p
-    903:915:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):959 -> p
-    903:915:boolean parseOption():449 -> p
-    916:916:void verifyAndLinkBackReferences(java.lang.Iterable):1030:1030 -> p
-    916:916:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):959 -> p
-    916:916:boolean parseOption():449 -> p
-    917:917:boolean parseOption():0:0 -> p
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":980,"2":981,"3":982}}
-    980:980:void verifyAndLinkBackReferences(java.lang.Iterable):1030:1030 -> p
-    980:980:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):959 -> p
-    980:980:boolean parseOption():449 -> p
-    981:981:void verifyAndLinkBackReferences(java.lang.Iterable):1030:1030 -> p
-    981:981:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):959 -> p
-    981:981:boolean parseOption():449 -> p
-    982:982:void verifyAndLinkBackReferences(java.lang.Iterable):1030:1030 -> p
-    982:982:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):959 -> p
-    982:982:boolean parseOption():449 -> p
-    918:922:void verifyAndLinkBackReferences(java.lang.Iterable):1030:1030 -> p
-    918:922:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):959 -> p
-    918:922:boolean parseOption():449 -> p
-    929:931:void verifyAndLinkBackReferences(java.lang.Iterable):1037:1039 -> p
-    929:931:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):959 -> p
-    929:931:boolean parseOption():449 -> p
-    932:932:boolean parseOption():449:449 -> p
-    933:935:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):962:962 -> p
-    933:935:boolean parseOption():449 -> p
-    936:954:boolean parseOption():450:468 -> p
-    955:955:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> p
-    955:955:boolean parseOption():470 -> p
-    956:956:boolean parseOption():0:0 -> p
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":983,"2":984,"3":985,"4":986,"5":987,"6":988,"7":989}}
-    983:983:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> p
-    983:983:boolean parseOption():470 -> p
-    984:984:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> p
-    984:984:boolean parseOption():470 -> p
-    985:985:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> p
-    985:985:boolean parseOption():470 -> p
-    986:986:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> p
-    986:986:boolean parseOption():470 -> p
-    987:987:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> p
-    987:987:boolean parseOption():470 -> p
-    988:988:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> p
-    988:988:boolean parseOption():470 -> p
-    989:989:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> p
-    989:989:boolean parseOption():470 -> p
-    957:960:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):609:609 -> p
-    957:960:boolean parseOption():470 -> p
-    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2157:2176 -> q
-    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2173:2178 -> q
-    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2163:2163 -> q
-    1:1:char peekChar():1776:1776 -> r
-    1:11:void skipOptimizationName():771:781 -> s
-    1:6:void skipWhitespace():1693:1698 -> t
-    7:14:void skipComment():1704:1711 -> t
-    7:14:void skipWhitespace():1700 -> t
-com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.shaking.Q1:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":552,"2":553,"3":554}}
+    552:552:void parse():266:266 -> j
+    553:553:void parse():266:266 -> j
+    554:554:void parse():266:266 -> j
+    272:274:void parse():266:266 -> j
+    278:279:void parse():270:271 -> j
+    280:280:void parse():0:0 -> j
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":559,"2":560,"3":561}}
+    559:559:void parse():271:271 -> j
+    560:560:void parse():271:271 -> j
+    561:561:void parse():271:271 -> j
+    551:551:void parse():271:271 -> j
+    1:12:java.util.List parseArgumentList():1545:1556 -> k
+    13:13:java.util.List parseArgumentList():1553:1553 -> k
+    14:14:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2201:2201 -> k
+    14:14:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> k
+    14:14:java.util.List parseArgumentList():1558 -> k
+    15:16:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2194:2195 -> k
+    15:16:java.util.List parseArgumentList():1558 -> k
+    17:19:java.util.List parseArgumentList():1561:1561 -> k
+    21:21:java.util.List parseArgumentList():1563:1563 -> k
+    22:22:java.util.List parseArgumentList():1560:1560 -> k
+    23:23:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2201:2201 -> k
+    23:23:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> k
+    23:23:java.util.List parseArgumentList():1560 -> k
+    24:25:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2194:2195 -> k
+    24:25:java.util.List parseArgumentList():1560 -> k
+    26:26:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2203:2203 -> k
+    26:26:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> k
+    26:26:java.util.List parseArgumentList():1560 -> k
+    27:28:java.util.List parseArgumentList():1566:1567 -> k
+    29:29:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2203:2203 -> k
+    29:29:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2193 -> k
+    29:29:java.util.List parseArgumentList():1558 -> k
+    1:7:java.lang.String parseFileFilter():1682:1688 -> l
+    1:2:void parseInclude():686:687 -> m
+    3:4:java.nio.file.Path parseFileInputDependency(java.util.function.BiConsumer):1608:1609 -> m
+    3:4:void parseInclude():687 -> m
+    5:6:void parseInclude():689:690 -> m
+    7:7:void parseInclude():0:0 -> m
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1408,"2":1409,"3":1410}}
+    1408:1408:void parseInclude():695:695 -> m
+    1409:1409:void parseInclude():695:695 -> m
+    1410:1410:void parseInclude():695:695 -> m
+    702:702:void parseInclude():695:695 -> m
+    703:704:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2283:2284 -> m
+    703:704:void parseInclude():695 -> m
+    705:706: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 -> m
+    705:706:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2284 -> m
+    705:706:void parseInclude():695 -> m
+    707:707:void parseInclude():695:695 -> m
+    708:708:void parseInclude():0:0 -> m
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1411,"2":1412,"3":1413}}
+    1411:1411:void parseInclude():692:692 -> m
+    1412:1412:void parseInclude():692:692 -> m
+    1413:1413:void parseInclude():692:692 -> m
+    1400:1400:void parseInclude():692:692 -> m
+    1401:1402:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2283:2284 -> m
+    1401:1402:void parseInclude():692 -> m
+    1403:1404: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 -> m
+    1403:1404:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2284 -> m
+    1403:1404:void parseInclude():692 -> m
+    1405:1405:void parseInclude():692:692 -> m
+    1:1:boolean parseOption():275:275 -> n
+    2:2:int remainingChars():1847:1847 -> n
+    2:2:boolean acceptArobaseInclude():701 -> n
+    2:2:boolean parseOption():278 -> n
+    3:6:boolean acceptArobaseInclude():704:707 -> n
+    3:6:boolean parseOption():278 -> n
+    7:10:boolean parseOption():281:284 -> n
+    11:11:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):488:488 -> n
+    11:11:boolean parseOption():285 -> n
+    12:12:com.android.tools.r8.shaking.CheckEnumUnboxedRule parseCheckEnumUnboxedRule(com.android.tools.r8.position.Position):1731:1731 -> n
+    12:12:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):489 -> n
+    12:12:boolean parseOption():285 -> n
+    13:13:com.android.tools.r8.shaking.CheckEnumUnboxedRule$Builder com.android.tools.r8.shaking.CheckEnumUnboxedRule.builder():77:77 -> n
+    13:13:com.android.tools.r8.shaking.CheckEnumUnboxedRule parseCheckEnumUnboxedRule(com.android.tools.r8.position.Position):1731 -> n
+    13:13:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):489 -> n
+    13:13:boolean parseOption():285 -> n
+    14:14:com.android.tools.r8.shaking.CheckEnumUnboxedRule parseCheckEnumUnboxedRule(com.android.tools.r8.position.Position):1731:1731 -> n
+    14:14:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):489 -> n
+    14:14:boolean parseOption():285 -> n
+    15:16:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    15:16:com.android.tools.r8.shaking.CheckEnumUnboxedRule parseCheckEnumUnboxedRule(com.android.tools.r8.position.Position):1731 -> n
+    15:16:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):489 -> n
+    15:16:boolean parseOption():285 -> n
+    17:17:com.android.tools.r8.shaking.CheckEnumUnboxedRule parseCheckEnumUnboxedRule(com.android.tools.r8.position.Position):1731:1731 -> n
+    17:17:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):489 -> n
+    17:17:boolean parseOption():285 -> n
+    18:19:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    18:19:com.android.tools.r8.shaking.CheckEnumUnboxedRule parseCheckEnumUnboxedRule(com.android.tools.r8.position.Position):1731 -> n
+    18:19:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):489 -> n
+    18:19:boolean parseOption():285 -> n
+    20:20:com.android.tools.r8.shaking.CheckEnumUnboxedRule parseCheckEnumUnboxedRule(com.android.tools.r8.position.Position):1731:1731 -> n
+    20:20:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):489 -> n
+    20:20:boolean parseOption():285 -> n
+    21:21:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    21:21:com.android.tools.r8.shaking.CheckEnumUnboxedRule parseCheckEnumUnboxedRule(com.android.tools.r8.position.Position):1732 -> n
+    21:21:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):489 -> n
+    21:21:boolean parseOption():285 -> n
+    22:23:com.android.tools.r8.shaking.CheckEnumUnboxedRule parseCheckEnumUnboxedRule(com.android.tools.r8.position.Position):1733:1734 -> n
+    22:23:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):489 -> n
+    22:23:boolean parseOption():285 -> n
+    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 -> n
+    24:24:com.android.tools.r8.shaking.CheckEnumUnboxedRule parseCheckEnumUnboxedRule(com.android.tools.r8.position.Position):1735 -> n
+    24:24:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):489 -> n
+    24:24:boolean parseOption():285 -> n
+    25:35:com.android.tools.r8.shaking.CheckEnumUnboxedRule com.android.tools.r8.shaking.CheckEnumUnboxedRule$Builder.build():29:39 -> n
+    25:35:com.android.tools.r8.shaking.CheckEnumUnboxedRule parseCheckEnumUnboxedRule(com.android.tools.r8.position.Position):1736 -> n
+    25:35:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):489 -> n
+    25:35:boolean parseOption():285 -> n
+    36:41:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):490:495 -> n
+    36:41:boolean parseOption():285 -> n
+    42:42:com.android.tools.r8.shaking.ConvertCheckNotNullRule parseConvertCheckNotNullRule(com.android.tools.r8.position.Position):1742:1742 -> n
+    42:42:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):496 -> n
+    42:42:boolean parseOption():285 -> n
+    43:43:com.android.tools.r8.shaking.ConvertCheckNotNullRule$Builder com.android.tools.r8.shaking.ConvertCheckNotNullRule.builder():78:78 -> n
+    43:43:com.android.tools.r8.shaking.ConvertCheckNotNullRule parseConvertCheckNotNullRule(com.android.tools.r8.position.Position):1742 -> n
+    43:43:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):496 -> n
+    43:43:boolean parseOption():285 -> n
+    44:44:com.android.tools.r8.shaking.ConvertCheckNotNullRule parseConvertCheckNotNullRule(com.android.tools.r8.position.Position):1742:1742 -> n
+    44:44:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):496 -> n
+    44:44:boolean parseOption():285 -> n
+    45:46:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    45:46:com.android.tools.r8.shaking.ConvertCheckNotNullRule parseConvertCheckNotNullRule(com.android.tools.r8.position.Position):1742 -> n
+    45:46:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):496 -> n
+    45:46:boolean parseOption():285 -> n
+    47:47:com.android.tools.r8.shaking.ConvertCheckNotNullRule parseConvertCheckNotNullRule(com.android.tools.r8.position.Position):1742:1742 -> n
+    47:47:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):496 -> n
+    47:47:boolean parseOption():285 -> n
+    48:49:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    48:49:com.android.tools.r8.shaking.ConvertCheckNotNullRule parseConvertCheckNotNullRule(com.android.tools.r8.position.Position):1742 -> n
+    48:49:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):496 -> n
+    48:49:boolean parseOption():285 -> n
+    50:50:com.android.tools.r8.shaking.ConvertCheckNotNullRule parseConvertCheckNotNullRule(com.android.tools.r8.position.Position):1742:1742 -> n
+    50:50:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):496 -> n
+    50:50:boolean parseOption():285 -> n
+    51:51:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    51:51:com.android.tools.r8.shaking.ConvertCheckNotNullRule parseConvertCheckNotNullRule(com.android.tools.r8.position.Position):1743 -> n
+    51:51:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):496 -> n
+    51:51:boolean parseOption():285 -> n
+    52:53:com.android.tools.r8.shaking.ConvertCheckNotNullRule parseConvertCheckNotNullRule(com.android.tools.r8.position.Position):1744:1745 -> n
+    52:53:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):496 -> n
+    52:53:boolean parseOption():285 -> n
+    54:54:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    54:54:com.android.tools.r8.shaking.ConvertCheckNotNullRule parseConvertCheckNotNullRule(com.android.tools.r8.position.Position):1746 -> n
+    54:54:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):496 -> n
+    54:54:boolean parseOption():285 -> n
+    55:65:com.android.tools.r8.shaking.ConvertCheckNotNullRule com.android.tools.r8.shaking.ConvertCheckNotNullRule$Builder.build():29:39 -> n
+    55:65:com.android.tools.r8.shaking.ConvertCheckNotNullRule parseConvertCheckNotNullRule(com.android.tools.r8.position.Position):1747 -> n
+    55:65:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):496 -> n
+    55:65:boolean parseOption():285 -> n
+    66:73:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):497:504 -> n
+    66:73:boolean parseOption():285 -> n
+    74:74:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1032:1032 -> n
+    74:74:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504 -> n
+    74:74:boolean parseOption():285 -> n
+    75:75:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder com.android.tools.r8.shaking.WhyAreYouNotInliningRule.builder():76:76 -> n
+    75:75:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1032 -> n
+    75:75:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504 -> n
+    75:75:boolean parseOption():285 -> n
+    76:76:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1032:1032 -> n
+    76:76:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504 -> n
+    76:76:boolean parseOption():285 -> n
+    77:78:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    77:78:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1032 -> n
+    77:78:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504 -> n
+    77:78:boolean parseOption():285 -> n
+    79:79:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1032:1032 -> n
+    79:79:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504 -> n
+    79:79:boolean parseOption():285 -> n
+    80:81:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    80:81:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1032 -> n
+    80:81:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504 -> n
+    80:81:boolean parseOption():285 -> n
+    82:82:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1032:1032 -> n
+    82:82:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504 -> n
+    82:82:boolean parseOption():285 -> n
+    83:83:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    83:83:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1033 -> n
+    83:83:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504 -> n
+    83:83:boolean parseOption():285 -> n
+    84:85:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1034:1035 -> n
+    84:85:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504 -> n
+    84:85:boolean parseOption():285 -> n
+    86:86:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    86:86:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1036 -> n
+    86:86:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504 -> n
+    86:86:boolean parseOption():285 -> n
+    87:97:com.android.tools.r8.shaking.WhyAreYouNotInliningRule com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder.build():28:38 -> n
+    87:97:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):1037 -> n
+    87:97:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504 -> n
+    87:97:boolean parseOption():285 -> n
+    98:98:boolean parseExperimentalOption(com.android.tools.r8.position.TextPosition):504:504 -> n
+    98:98:boolean parseOption():285 -> n
+    99:100:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):513:514 -> n
+    99:100:boolean parseOption():286 -> n
+    101:101:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1708:1708 -> n
+    101:101:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> n
+    101:101:boolean parseOption():286 -> n
+    102:102:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule.builder():75:75 -> n
+    102:102:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1708 -> n
+    102:102:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> n
+    102:102:boolean parseOption():286 -> n
+    103:103:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1708:1708 -> n
+    103:103:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> n
+    103:103:boolean parseOption():286 -> n
+    104:105:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    104:105:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1708 -> n
+    104:105:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> n
+    104:105:boolean parseOption():286 -> n
+    106:106:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1708:1708 -> n
+    106:106:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> n
+    106:106:boolean parseOption():286 -> n
+    107:108:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    107:108:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1708 -> n
+    107:108:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> n
+    107:108:boolean parseOption():286 -> n
+    109:109:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1708:1708 -> n
+    109:109:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> n
+    109:109:boolean parseOption():286 -> n
+    110:110:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    110:110:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1709 -> n
+    110:110:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> n
+    110:110:boolean parseOption():286 -> n
+    111:112:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1710:1711 -> n
+    111:112:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> n
+    111:112:boolean parseOption():286 -> n
+    113:113:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    113:113:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1712 -> n
+    113:113:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> n
+    113:113:boolean parseOption():286 -> n
+    114:124:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder.build():26:36 -> n
+    114:124:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1713 -> n
+    114:124:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> n
+    114:124:boolean parseOption():286 -> n
+    125:130:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):517:522 -> n
+    125:130:boolean parseOption():286 -> n
+    131:131:com.android.tools.r8.shaking.KeepConstantArgumentRule$Builder com.android.tools.r8.shaking.KeepConstantArgumentRule.builder():76:76 -> n
+    131:131:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):522 -> n
+    131:131:boolean parseOption():286 -> n
+    132:138:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):522:528 -> n
+    132:138:boolean parseOption():286 -> n
+    139:139:com.android.tools.r8.shaking.KeepUnusedArgumentRule$Builder com.android.tools.r8.shaking.KeepUnusedArgumentRule.builder():76:76 -> n
+    139:139:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):528 -> n
+    139:139:boolean parseOption():286 -> n
+    140:146:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):528:534 -> n
+    140:146:boolean parseOption():286 -> n
+    147:147:com.android.tools.r8.shaking.KeepUnusedReturnValueRule$Builder com.android.tools.r8.shaking.KeepUnusedReturnValueRule.builder():77:77 -> n
+    147:147:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):534 -> n
+    147:147:boolean parseOption():286 -> n
+    148:172:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):534:558 -> n
+    148:172:boolean parseOption():286 -> n
+    173:173:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):871:871 -> n
+    173:173:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):559 -> n
+    173:173:boolean parseOption():286 -> n
+    174:174:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$Builder com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule.builder():77:77 -> n
+    174:174:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):871 -> n
+    174:174:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):559 -> n
+    174:174:boolean parseOption():286 -> n
+    175:175:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):871:871 -> n
+    175:175:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):559 -> n
+    175:175:boolean parseOption():286 -> n
+    176:177:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    176:177:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):871 -> n
+    176:177:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):559 -> n
+    176:177:boolean parseOption():286 -> n
+    178:178:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):871:871 -> n
+    178:178:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):559 -> n
+    178:178:boolean parseOption():286 -> n
+    179:180:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    179:180:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):871 -> n
+    179:180:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):559 -> n
+    179:180:boolean parseOption():286 -> n
+    181:181:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):871:871 -> n
+    181:181:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):559 -> n
+    181:181:boolean parseOption():286 -> n
+    182:182:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    182:182:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):872 -> n
+    182:182:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):559 -> n
+    182:182:boolean parseOption():286 -> n
+    183:184:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):873:874 -> n
+    183:184:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):559 -> n
+    183:184:boolean parseOption():286 -> n
+    185:185:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    185:185:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):875 -> n
+    185:185:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):559 -> n
+    185:185:boolean parseOption():286 -> n
+    186:196:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule$Builder.build():29:39 -> n
+    186:196:com.android.tools.r8.shaking.NoFieldTypeStrengtheningRule parseNoFieldTypeStrengtheningRule(com.android.tools.r8.position.Position):876 -> n
+    186:196:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):559 -> n
+    186:196:boolean parseOption():286 -> n
+    197:200:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):560:563 -> n
+    197:200:boolean parseOption():286 -> n
+    201:201:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):882:882 -> n
+    201:201:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):564 -> n
+    201:201:boolean parseOption():286 -> n
+    202:202:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule.builder():76:76 -> n
+    202:202:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):882 -> n
+    202:202:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):564 -> n
+    202:202:boolean parseOption():286 -> n
+    203:203:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):882:882 -> n
+    203:203:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):564 -> n
+    203:203:boolean parseOption():286 -> n
+    204:205:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    204:205:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):882 -> n
+    204:205:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):564 -> n
+    204:205:boolean parseOption():286 -> n
+    206:206:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):882:882 -> n
+    206:206:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):564 -> n
+    206:206:boolean parseOption():286 -> n
+    207:208:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    207:208:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):882 -> n
+    207:208:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):564 -> n
+    207:208:boolean parseOption():286 -> n
+    209:209:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):882:882 -> n
+    209:209:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):564 -> n
+    209:209:boolean parseOption():286 -> n
+    210:210:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    210:210:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):883 -> n
+    210:210:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):564 -> n
+    210:210:boolean parseOption():286 -> n
+    211:212:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):884:885 -> n
+    211:212:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):564 -> n
+    211:212:boolean parseOption():286 -> n
+    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 -> n
+    213:213:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):886 -> n
+    213:213:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):564 -> n
+    213:213:boolean parseOption():286 -> n
+    214:224:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder.build():28:38 -> n
+    214:224:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):887 -> n
+    214:224:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):564 -> n
+    214:224:boolean parseOption():286 -> n
+    225:228:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):565:568 -> n
+    225:228:boolean parseOption():286 -> n
+    229:229:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):893:893 -> n
+    229:229:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569 -> n
+    229:229:boolean parseOption():286 -> n
+    230:230:com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder com.android.tools.r8.shaking.NoVerticalClassMergingRule.builder():76:76 -> n
+    230:230:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):893 -> n
+    230:230:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569 -> n
+    230:230:boolean parseOption():286 -> n
+    231:231:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):893:893 -> n
+    231:231:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569 -> n
+    231:231:boolean parseOption():286 -> n
+    232:233:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    232:233:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):893 -> n
+    232:233:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569 -> n
+    232:233:boolean parseOption():286 -> n
+    234:234:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):893:893 -> n
+    234:234:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569 -> n
+    234:234:boolean parseOption():286 -> n
+    235:236:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    235:236:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):893 -> n
+    235:236:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569 -> n
+    235:236:boolean parseOption():286 -> n
+    237:237:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):893:893 -> n
+    237:237:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569 -> n
+    237:237:boolean parseOption():286 -> n
+    238:238:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    238:238:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):894 -> n
+    238:238:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569 -> n
+    238:238:boolean parseOption():286 -> n
+    239:240:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):895:896 -> n
+    239:240:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569 -> n
+    239:240:boolean parseOption():286 -> n
+    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 -> n
+    241:241:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):897 -> n
+    241:241:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569 -> n
+    241:241:boolean parseOption():286 -> n
+    242:252:com.android.tools.r8.shaking.NoVerticalClassMergingRule com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder.build():28:38 -> n
+    242:252:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):898 -> n
+    242:252:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):569 -> n
+    242:252:boolean parseOption():286 -> n
+    253:256:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):570:573 -> n
+    253:256:boolean parseOption():286 -> n
+    257:257:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):904:904 -> n
+    257:257:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> n
+    257:257:boolean parseOption():286 -> n
+    258:258:com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder com.android.tools.r8.shaking.NoHorizontalClassMergingRule.builder():77:77 -> n
+    258:258:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):904 -> n
+    258:258:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> n
+    258:258:boolean parseOption():286 -> n
+    259:259:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):904:904 -> n
+    259:259:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> n
+    259:259:boolean parseOption():286 -> n
+    260:261:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    260:261:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):904 -> n
+    260:261:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> n
+    260:261:boolean parseOption():286 -> n
+    262:262:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):904:904 -> n
+    262:262:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> n
+    262:262:boolean parseOption():286 -> n
+    263:264:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    263:264:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):904 -> n
+    263:264:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> n
+    263:264:boolean parseOption():286 -> n
+    265:265:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):904:904 -> n
+    265:265:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> n
+    265:265:boolean parseOption():286 -> n
+    266:266:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    266:266:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):905 -> n
+    266:266:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> n
+    266:266:boolean parseOption():286 -> n
+    267:268:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):906:907 -> n
+    267:268:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> n
+    267:268:boolean parseOption():286 -> n
+    269:269:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    269:269:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):908 -> n
+    269:269:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> n
+    269:269:boolean parseOption():286 -> n
+    270:280:com.android.tools.r8.shaking.NoHorizontalClassMergingRule com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder.build():29:39 -> n
+    270:280:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):909 -> n
+    270:280:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):574 -> n
+    270:280:boolean parseOption():286 -> n
+    281:286:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):575:580 -> n
+    281:286:boolean parseOption():286 -> n
+    287:287:com.android.tools.r8.shaking.NoMethodStaticizingRule$Builder com.android.tools.r8.shaking.NoMethodStaticizingRule.builder():77:77 -> n
+    287:287:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):580 -> n
+    287:287:boolean parseOption():286 -> n
+    288:294:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):580:586 -> n
+    288:294:boolean parseOption():286 -> n
+    295:295:com.android.tools.r8.shaking.NoParameterReorderingRule$Builder com.android.tools.r8.shaking.NoParameterReorderingRule.builder():77:77 -> n
+    295:295:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):586 -> n
+    295:295:boolean parseOption():286 -> n
+    296:302:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):586:592 -> n
+    296:302:boolean parseOption():286 -> n
+    303:303:com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule$Builder com.android.tools.r8.shaking.NoParameterTypeStrengtheningRule.builder():78:78 -> n
+    303:303:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):592 -> n
+    303:303:boolean parseOption():286 -> n
+    304:310:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):592:598 -> n
+    304:310:boolean parseOption():286 -> n
+    311:311:com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule$Builder com.android.tools.r8.shaking.NoReturnTypeStrengtheningRule.builder():78:78 -> n
+    311:311:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):598 -> n
+    311:311:boolean parseOption():286 -> n
+    312:316:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):598:602 -> n
+    312:316:boolean parseOption():286 -> n
+    317:317:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):926:926 -> n
+    317:317:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    317:317:boolean parseOption():286 -> n
+    318:318:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule.builder():91:91 -> n
+    318:318:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):926 -> n
+    318:318:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    318:318:boolean parseOption():286 -> n
+    319:319:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):926:926 -> n
+    319:319:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    319:319:boolean parseOption():286 -> n
+    320:321:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    320:321:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):926 -> n
+    320:321:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    320:321:boolean parseOption():286 -> n
+    322:322:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):926:926 -> n
+    322:322:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    322:322:boolean parseOption():286 -> n
+    323:324:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    323:324:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):926 -> n
+    323:324:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    323:324:boolean parseOption():286 -> n
+    325:325:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):926:926 -> n
+    325:325:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    325:325:boolean parseOption():286 -> n
+    326:326:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.setType(com.android.tools.r8.shaking.MemberValuePropagationRule$Type):32:32 -> n
+    326:326:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):926 -> n
+    326:326:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    326:326:boolean parseOption():286 -> n
+    327:327:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    327:327:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):927 -> n
+    327:327:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    327:327:boolean parseOption():286 -> n
+    328:329:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):928:929 -> n
+    328:329:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    328:329:boolean parseOption():286 -> n
+    330:330:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    330:330:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):930 -> n
+    330:330:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    330:330:boolean parseOption():286 -> n
+    331:341:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:48 -> n
+    331:341:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):931 -> n
+    331:341:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):604 -> n
+    331:341:boolean parseOption():286 -> n
+    342:346:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):605:609 -> n
+    342:346:boolean parseOption():286 -> n
+    347:347:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010:1010 -> n
+    347:347:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):610 -> n
+    347:347:boolean parseOption():286 -> n
+    348:348:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder com.android.tools.r8.shaking.ReprocessClassInitializerRule.builder():92:92 -> n
+    348:348:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010 -> n
+    348:348:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):610 -> n
+    348:348:boolean parseOption():286 -> n
+    349:349:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010:1010 -> n
+    349:349:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):610 -> n
+    349:349:boolean parseOption():286 -> n
+    350:350:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> n
+    350:350:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010 -> n
+    350:350:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):610 -> n
+    350:350:boolean parseOption():286 -> n
+    351:351:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> n
+    351:351:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010 -> n
+    351:351:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):610 -> n
+    351:351:boolean parseOption():286 -> n
+    352:352:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010:1010 -> n
+    352:352:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):610 -> n
+    352:352:boolean parseOption():286 -> n
+    353:353:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    353:353:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1011 -> n
+    353:353:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):610 -> n
+    353:353:boolean parseOption():286 -> n
+    354:355:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1012:1013 -> n
+    354:355:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):610 -> n
+    354:355:boolean parseOption():286 -> n
+    356:356:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    356:356:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1014 -> n
+    356:356:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):610 -> n
+    356:356:boolean parseOption():286 -> n
+    357:357:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1015:1015 -> n
+    357:357:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):610 -> n
+    357:357:boolean parseOption():286 -> n
+    358:364:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):609:615 -> n
+    358:364:boolean parseOption():286 -> n
+    365:365:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021:1021 -> n
+    365:365:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):616 -> n
+    365:365:boolean parseOption():286 -> n
+    366:366:com.android.tools.r8.shaking.ReprocessMethodRule$Builder com.android.tools.r8.shaking.ReprocessMethodRule.builder():92:92 -> n
+    366:366:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021 -> n
+    366:366:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):616 -> n
+    366:366:boolean parseOption():286 -> n
+    367:367:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021:1021 -> n
+    367:367:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):616 -> n
+    367:367:boolean parseOption():286 -> n
+    368:368:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> n
+    368:368:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021 -> n
+    368:368:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):616 -> n
+    368:368:boolean parseOption():286 -> n
+    369:369:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> n
+    369:369:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021 -> n
+    369:369:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):616 -> n
+    369:369:boolean parseOption():286 -> n
+    370:370:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021:1021 -> n
+    370:370:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):616 -> n
+    370:370:boolean parseOption():286 -> n
+    371:371:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    371:371:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1022 -> n
+    371:371:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):616 -> n
+    371:371:boolean parseOption():286 -> n
+    372:373:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1023:1024 -> n
+    372:373:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):616 -> n
+    372:373:boolean parseOption():286 -> n
+    374:374:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    374:374:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1025 -> n
+    374:374:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):616 -> n
+    374:374:boolean parseOption():286 -> n
+    375:375:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1026:1026 -> n
+    375:375:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):616 -> n
+    375:375:boolean parseOption():286 -> n
+    376:381:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):615:620 -> n
+    376:381:boolean parseOption():286 -> n
+    382:382:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010:1010 -> n
+    382:382:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):621 -> n
+    382:382:boolean parseOption():286 -> n
+    383:383:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder com.android.tools.r8.shaking.ReprocessClassInitializerRule.builder():92:92 -> n
+    383:383:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010 -> n
+    383:383:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):621 -> n
+    383:383:boolean parseOption():286 -> n
+    384:384:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010:1010 -> n
+    384:384:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):621 -> n
+    384:384:boolean parseOption():286 -> n
+    385:385:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> n
+    385:385:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010 -> n
+    385:385:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):621 -> n
+    385:385:boolean parseOption():286 -> n
+    386:386:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> n
+    386:386:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010 -> n
+    386:386:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):621 -> n
+    386:386:boolean parseOption():286 -> n
+    387:387:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1010:1010 -> n
+    387:387:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):621 -> n
+    387:387:boolean parseOption():286 -> n
+    388:388:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    388:388:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1011 -> n
+    388:388:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):621 -> n
+    388:388:boolean parseOption():286 -> n
+    389:390:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1012:1013 -> n
+    389:390:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):621 -> n
+    389:390:boolean parseOption():286 -> n
+    391:391:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    391:391:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1014 -> n
+    391:391:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):621 -> n
+    391:391:boolean parseOption():286 -> n
+    392:392:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):1015:1015 -> n
+    392:392:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):621 -> n
+    392:392:boolean parseOption():286 -> n
+    393:399:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):620:626 -> n
+    393:399:boolean parseOption():286 -> n
+    400:400:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021:1021 -> n
+    400:400:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):627 -> n
+    400:400:boolean parseOption():286 -> n
+    401:401:com.android.tools.r8.shaking.ReprocessMethodRule$Builder com.android.tools.r8.shaking.ReprocessMethodRule.builder():92:92 -> n
+    401:401:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021 -> n
+    401:401:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):627 -> n
+    401:401:boolean parseOption():286 -> n
+    402:402:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021:1021 -> n
+    402:402:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):627 -> n
+    402:402:boolean parseOption():286 -> n
+    403:403:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> n
+    403:403:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021 -> n
+    403:403:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):627 -> n
+    403:403:boolean parseOption():286 -> n
+    404:404:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> n
+    404:404:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021 -> n
+    404:404:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):627 -> n
+    404:404:boolean parseOption():286 -> n
+    405:405:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1021:1021 -> n
+    405:405:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):627 -> n
+    405:405:boolean parseOption():286 -> n
+    406:406:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    406:406:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1022 -> n
+    406:406:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):627 -> n
+    406:406:boolean parseOption():286 -> n
+    407:408:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1023:1024 -> n
+    407:408:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):627 -> n
+    407:408:boolean parseOption():286 -> n
+    409:409:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    409:409:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1025 -> n
+    409:409:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):627 -> n
+    409:409:boolean parseOption():286 -> n
+    410:410:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):1026:1026 -> n
+    410:410:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):627 -> n
+    410:410:boolean parseOption():286 -> n
+    411:411:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):626:626 -> n
+    411:411:boolean parseOption():286 -> n
+    412:419:boolean parseOption():287:294 -> n
+    420:432:boolean parseOption():290:302 -> n
+    433:460:java.util.List acceptPatternList():2073:2100 -> n
+    433:460:void parseKeepAttributes():712 -> n
+    433:460:boolean parseOption():303 -> n
+    461:464:void parseKeepAttributes():713:716 -> n
+    461:464:boolean parseOption():303 -> n
+    465:465:void parseKeepAttributes():714:714 -> n
+    465:465:boolean parseOption():303 -> n
+    466:467:boolean parseOption():304:305 -> n
+    468:477:void parsePackageFilter(java.util.function.BiConsumer):2142:2151 -> n
+    468:477:boolean parseOption():305 -> n
+    478:481:void parsePackageFilter(java.util.function.BiConsumer):2150:2153 -> n
+    478:481:boolean parseOption():305 -> n
+    482:489:void parsePackageFilter(java.util.function.BiConsumer):2148:2155 -> n
+    482:489:boolean parseOption():305 -> n
+    490:500:boolean parseOption():306:316 -> n
+    501:505:void parsePathFilter(java.util.function.Consumer):2214:2218 -> n
+    501:505:boolean parseOption():316 -> n
+    506:509:boolean parseOption():317:320 -> n
+    510:510:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):835:835 -> n
+    510:510:boolean parseOption():321 -> n
+    511:511:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule.builder():74:74 -> n
+    511:511:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):835 -> n
+    511:511:boolean parseOption():321 -> n
+    512:512:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):835:835 -> n
+    512:512:boolean parseOption():321 -> n
+    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 -> n
+    513:514:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):836 -> n
+    513:514:boolean parseOption():321 -> n
+    515:515:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):836:836 -> n
+    515:515:boolean parseOption():321 -> n
+    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 -> n
+    516:517:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):837 -> n
+    516:517:boolean parseOption():321 -> n
+    518:518:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):837:837 -> n
+    518:518:boolean parseOption():321 -> n
+    519:519:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    519:519:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):838 -> n
+    519:519:boolean parseOption():321 -> n
+    520:521:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):839:840 -> n
+    520:521:boolean parseOption():321 -> n
+    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 -> n
+    522:522:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):841 -> n
+    522:522:boolean parseOption():321 -> n
+    523:533:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:36 -> n
+    523:533:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):842 -> n
+    523:533:boolean parseOption():321 -> n
+    534:539:boolean parseOption():322:327 -> n
+    540:540:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> n
+    540:540:boolean parseOption():332 -> n
+    541:541:boolean parseOption():0:0 -> n
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1046,"2":1047,"3":1048,"4":1049,"5":1050}}
+    1046:1046:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> n
+    1046:1046:boolean parseOption():332 -> n
+    1047:1047:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> n
+    1047:1047:boolean parseOption():332 -> n
+    1048:1048:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> n
+    1048:1048:boolean parseOption():332 -> n
+    1049:1049:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> n
+    1049:1049:boolean parseOption():332 -> n
+    1050:1050:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> n
+    1050:1050:boolean parseOption():332 -> n
+    542:544:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2293:2293 -> n
+    542:544:boolean parseOption():332 -> n
+    545:547:boolean parseOption():329:329 -> n
+    551:568:boolean parseOption():333:350 -> n
+    569:570:void parseClassFilter(java.util.function.Consumer):2161:2162 -> n
+    569:570:boolean parseOption():350 -> n
+    571:571:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2180:2180 -> n
+    571:571:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    571:571:boolean parseOption():350 -> n
+    572:572:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2201:2201 -> n
+    572:572:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2172 -> n
+    572:572:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    572:572:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    572:572:boolean parseOption():350 -> n
+    573:576:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2173:2173 -> n
+    573:576:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    573:576:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    573:576:boolean parseOption():350 -> n
+    579:579:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2176:2176 -> n
+    579:579:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    579:579:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    579:579:boolean parseOption():350 -> n
+    580:581:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2183:2184 -> n
+    580:581:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    580:581:boolean parseOption():350 -> n
+    582:582:void parseClassFilter(java.util.function.Consumer):2163:2163 -> n
+    582:582:boolean parseOption():350 -> n
+    583:583:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2203:2203 -> n
+    583:583:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2172 -> n
+    583:583:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    583:583:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    583:583:boolean parseOption():350 -> n
+    584:584:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> n
+    584:584:void parseClassFilter(java.util.function.Consumer):2166 -> n
+    584:584:boolean parseOption():350 -> n
+    585:585:void parseClassFilter(java.util.function.Consumer):2166:2166 -> n
+    585:585:boolean parseOption():350 -> n
+    586:586:void parseClassFilter(java.util.function.Consumer):2165:2165 -> n
+    586:586:boolean parseOption():350 -> n
+    587:588:boolean parseOption():351:352 -> n
+    589:590:void parseClassFilter(java.util.function.Consumer):2161:2162 -> n
+    589:590:boolean parseOption():352 -> n
+    591:591:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2180:2180 -> n
+    591:591:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    591:591:boolean parseOption():352 -> n
+    592:592:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2201:2201 -> n
+    592:592:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2172 -> n
+    592:592:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    592:592:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    592:592:boolean parseOption():352 -> n
+    593:596:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2173:2173 -> n
+    593:596:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    593:596:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    593:596:boolean parseOption():352 -> n
+    599:599:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2176:2176 -> n
+    599:599:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    599:599:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    599:599:boolean parseOption():352 -> n
+    600:601:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2183:2184 -> n
+    600:601:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    600:601:boolean parseOption():352 -> n
+    602:602:void parseClassFilter(java.util.function.Consumer):2163:2163 -> n
+    602:602:boolean parseOption():352 -> n
+    603:603:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2203:2203 -> n
+    603:603:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2172 -> n
+    603:603:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    603:603:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    603:603:boolean parseOption():352 -> n
+    604:604:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> n
+    604:604:void parseClassFilter(java.util.function.Consumer):2166 -> n
+    604:604:boolean parseOption():352 -> n
+    605:605:void parseClassFilter(java.util.function.Consumer):2166:2166 -> n
+    605:605:boolean parseOption():352 -> n
+    606:606:void parseClassFilter(java.util.function.Consumer):2165:2165 -> n
+    606:606:boolean parseOption():352 -> n
+    607:608:boolean parseOption():353:354 -> n
+    609:609:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    609:609:boolean parseOption():355 -> n
+    610:610:boolean parseOption():0:0 -> n
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1051,"2":1052,"3":1053,"4":1054,"5":1055,"6":1056,"7":1057}}
+    1051:1051:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1051:1051:boolean parseOption():355 -> n
+    1052:1052:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1052:1052:boolean parseOption():355 -> n
+    1053:1053:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1053:1053:boolean parseOption():355 -> n
+    1054:1054:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1054:1054:boolean parseOption():355 -> n
+    1055:1055:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1055:1055:boolean parseOption():355 -> n
+    1056:1056:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1056:1056:boolean parseOption():355 -> n
+    1057:1057:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1057:1057:boolean parseOption():355 -> n
+    611:613:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    611:613:boolean parseOption():355 -> n
+    614:617:boolean parseOption():357:360 -> n
+    618:619:java.lang.String parsePackageNameOrEmptyString():2188:2189 -> n
+    618:619:boolean parseOption():360 -> n
+    620:626:boolean parseOption():360:366 -> n
+    627:628:java.lang.String parsePackageNameOrEmptyString():2188:2189 -> n
+    627:628:boolean parseOption():366 -> n
+    629:633:boolean parseOption():366:370 -> n
+    634:634:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    634:634:boolean parseOption():371 -> n
+    635:635:boolean parseOption():0:0 -> n
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1058,"2":1059,"3":1060,"4":1061,"5":1062,"6":1063,"7":1064}}
+    1058:1058:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1058:1058:boolean parseOption():371 -> n
+    1059:1059:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1059:1059:boolean parseOption():371 -> n
+    1060:1060:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1060:1060:boolean parseOption():371 -> n
+    1061:1061:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1061:1061:boolean parseOption():371 -> n
+    1062:1062:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1062:1062:boolean parseOption():371 -> n
+    1063:1063:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1063:1063:boolean parseOption():371 -> n
+    1064:1064:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    1064:1064:boolean parseOption():371 -> n
+    636:638:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2303:2303 -> n
+    636:638:boolean parseOption():371 -> n
+    639:640:boolean parseOption():372:373 -> n
+    641:642:void skipSingleArgument():804:805 -> n
+    641:642:boolean parseOption():374 -> n
+    643:643:char readChar():1843:1843 -> n
+    643:643:void skipSingleArgument():806 -> n
+    643:643:boolean parseOption():374 -> n
+    644:647:boolean parseOption():377:380 -> n
+    648:649:java.lang.String parsePackageNameOrEmptyString():2188:2189 -> n
+    648:649:boolean parseOption():380 -> n
+    650:656:boolean parseOption():380:386 -> n
+    657:658:java.lang.String parsePackageNameOrEmptyString():2188:2189 -> n
+    657:658:boolean parseOption():386 -> n
+    659:681:boolean parseOption():386:408 -> n
+    682:683:java.nio.file.Path parseFileInputDependency(java.util.function.BiConsumer):1608:1609 -> n
+    682:683:boolean parseOption():408 -> n
+    684:686:boolean parseOption():407:409 -> n
+    687:687:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1695:1695 -> n
+    687:687:boolean parseOption():410 -> n
+    688:688:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule.builder():77:77 -> n
+    688:688:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1695 -> n
+    688:688:boolean parseOption():410 -> n
+    689:689:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1695:1695 -> n
+    689:689:boolean parseOption():410 -> n
+    690:691:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    690:691:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1696 -> n
+    690:691:boolean parseOption():410 -> n
+    692:692:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1696:1696 -> n
+    692:692:boolean parseOption():410 -> n
+    693:694:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    693:694:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1697 -> n
+    693:694:boolean parseOption():410 -> n
+    695:698:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1697:1700 -> n
+    695:698:boolean parseOption():410 -> n
+    699:699:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    699:699:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1701 -> n
+    699:699:boolean parseOption():410 -> n
+    700:710:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder.build():26:36 -> n
+    700:710:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1702 -> n
+    700:710:boolean parseOption():410 -> n
+    711:712:boolean parseOption():411:412 -> n
+    713:713:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1718:1718 -> n
+    713:713:boolean parseOption():413 -> n
+    714:714:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder com.android.tools.r8.shaking.ProguardAssumeValuesRule.builder():77:77 -> n
+    714:714:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1718 -> n
+    714:714:boolean parseOption():413 -> n
+    715:715:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1718:1718 -> n
+    715:715:boolean parseOption():413 -> n
+    716:717:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    716:717:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1719 -> n
+    716:717:boolean parseOption():413 -> n
+    718:718:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1719:1719 -> n
+    718:718:boolean parseOption():413 -> n
+    719:720:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    719:720:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1720 -> n
+    719:720:boolean parseOption():413 -> n
+    721:724:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1720:1723 -> n
+    721:724:boolean parseOption():413 -> n
+    725:725:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    725:725:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1724 -> n
+    725:725:boolean parseOption():413 -> n
+    726:736:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:36 -> n
+    726:736:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1725 -> n
+    726:736:boolean parseOption():413 -> n
+    737:741:boolean parseOption():414:418 -> n
+    742:752:boolean parseOption():417:427 -> n
+    753:757:java.util.List parseClassPath(java.util.function.BiConsumer):1645:1649 -> n
+    753:757:boolean parseOption():427 -> n
+    758:771:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1662:1675 -> n
+    758:771:java.util.List parseClassPath(java.util.function.BiConsumer):1650 -> n
+    758:771:boolean parseOption():427 -> n
+    772:777:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1672:1677 -> n
+    772:777:java.util.List parseClassPath(java.util.function.BiConsumer):1650 -> n
+    772:777:boolean parseOption():427 -> n
+    778:781:java.util.List parseClassPath(java.util.function.BiConsumer):1651:1654 -> n
+    778:781:boolean parseOption():427 -> n
+    782:795:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1662:1675 -> n
+    782:795:java.util.List parseClassPath(java.util.function.BiConsumer):1655 -> n
+    782:795:boolean parseOption():427 -> n
+    796:801:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1672:1677 -> n
+    796:801:java.util.List parseClassPath(java.util.function.BiConsumer):1655 -> n
+    796:801:boolean parseOption():427 -> n
+    802:802:java.util.List parseClassPath(java.util.function.BiConsumer):1656:1656 -> n
+    802:802:boolean parseOption():427 -> n
+    803:807:boolean parseOption():426:430 -> n
+    808:812:java.util.List parseClassPath(java.util.function.BiConsumer):1645:1649 -> n
+    808:812:boolean parseOption():430 -> n
+    813:826:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1662:1675 -> n
+    813:826:java.util.List parseClassPath(java.util.function.BiConsumer):1650 -> n
+    813:826:boolean parseOption():430 -> n
+    827:832:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1672:1677 -> n
+    827:832:java.util.List parseClassPath(java.util.function.BiConsumer):1650 -> n
+    827:832:boolean parseOption():430 -> n
+    833:836:java.util.List parseClassPath(java.util.function.BiConsumer):1651:1654 -> n
+    833:836:boolean parseOption():430 -> n
+    837:850:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1662:1675 -> n
+    837:850:java.util.List parseClassPath(java.util.function.BiConsumer):1655 -> n
+    837:850:boolean parseOption():430 -> n
+    851:856:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1672:1677 -> n
+    851:856:java.util.List parseClassPath(java.util.function.BiConsumer):1655 -> n
+    851:856:boolean parseOption():430 -> n
+    857:857:java.util.List parseClassPath(java.util.function.BiConsumer):1656:1656 -> n
+    857:857:boolean parseOption():430 -> n
+    858:868:boolean parseOption():429:439 -> n
+    869:870:java.nio.file.Path parseFileInputDependency(java.util.function.BiConsumer):1608:1609 -> n
+    869:870:boolean parseOption():439 -> n
+    871:876:boolean parseOption():438:443 -> n
+    877:878:java.nio.file.Path parseFileInputDependency(java.util.function.BiConsumer):1608:1609 -> n
+    877:878:boolean parseOption():442 -> n
+    879:885:boolean parseOption():441:447 -> n
+    886:887:java.nio.file.Path parseFileInputDependency(java.util.function.BiConsumer):1608:1609 -> n
+    886:887:boolean parseOption():446 -> n
+    888:895:boolean parseOption():445:452 -> n
+    896:897:void parseClassFilter(java.util.function.Consumer):2161:2162 -> n
+    896:897:boolean parseOption():452 -> n
+    898:898:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2180:2180 -> n
+    898:898:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    898:898:boolean parseOption():452 -> n
+    899:899:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2201:2201 -> n
+    899:899:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2172 -> n
+    899:899:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    899:899:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    899:899:boolean parseOption():452 -> n
+    900:903:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2173:2173 -> n
+    900:903:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    900:903:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    900:903:boolean parseOption():452 -> n
+    906:906:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2176:2176 -> n
+    906:906:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    906:906:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    906:906:boolean parseOption():452 -> n
+    907:908:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2183:2184 -> n
+    907:908:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    907:908:boolean parseOption():452 -> n
+    909:909:void parseClassFilter(java.util.function.Consumer):2163:2163 -> n
+    909:909:boolean parseOption():452 -> n
+    910:910:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2203:2203 -> n
+    910:910:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):2172 -> n
+    910:910:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():2182 -> n
+    910:910:void parseClassFilter(java.util.function.Consumer):2163 -> n
+    910:910:boolean parseOption():452 -> n
+    911:911:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> n
+    911:911:void parseClassFilter(java.util.function.Consumer):2166 -> n
+    911:911:boolean parseOption():452 -> n
+    912:912:void parseClassFilter(java.util.function.Consumer):2166:2166 -> n
+    912:912:boolean parseOption():452 -> n
+    913:913:void parseClassFilter(java.util.function.Consumer):2165:2165 -> n
+    913:913:boolean parseOption():452 -> n
+    914:915:boolean parseOption():453:454 -> n
+    916:920:void parsePathFilter(java.util.function.Consumer):2214:2218 -> n
+    916:920:boolean parseOption():454 -> n
+    921:922:boolean parseOption():455:456 -> n
+    923:927:void parsePathFilter(java.util.function.Consumer):2214:2218 -> n
+    923:927:boolean parseOption():456 -> n
+    928:929:boolean parseOption():457:458 -> n
+    930:930:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):950:950 -> n
+    930:930:boolean parseOption():458 -> n
+    931:931:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder com.android.tools.r8.shaking.ProguardIdentifierNameStringRule.builder():73:73 -> n
+    931:931:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):950 -> n
+    931:931:boolean parseOption():458 -> n
+    932:932:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):950:950 -> n
+    932:932:boolean parseOption():458 -> n
+    933:934:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    933:934:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):951 -> n
+    933:934:boolean parseOption():458 -> n
+    935:935:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):951:951 -> n
+    935:935:boolean parseOption():458 -> n
+    936:937:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    936:937:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):952 -> n
+    936:937:boolean parseOption():458 -> n
+    938:938:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):952:952 -> n
+    938:938:boolean parseOption():458 -> n
+    939:939:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    939:939:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):953 -> n
+    939:939:boolean parseOption():458 -> n
+    940:941:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):954:955 -> n
+    940:941:boolean parseOption():458 -> n
+    942:942:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    942:942:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):956 -> n
+    942:942:boolean parseOption():458 -> n
+    943:953:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:35 -> n
+    943:953:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):957 -> n
+    943:953:boolean parseOption():458 -> n
+    954:956:boolean parseOption():458:460 -> n
+    957:957:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):962:962 -> n
+    957:957:boolean parseOption():460 -> n
+    958:958:com.android.tools.r8.shaking.ProguardIfRule$Builder com.android.tools.r8.shaking.ProguardIfRule.builder():136:136 -> n
+    958:958:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):962 -> n
+    958:958:boolean parseOption():460 -> n
+    959:959:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):962:962 -> n
+    959:959:boolean parseOption():460 -> n
+    960:961:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> n
+    960:961:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):963 -> n
+    960:961:boolean parseOption():460 -> n
+    962:962:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):963:963 -> n
+    962:962:boolean parseOption():460 -> n
+    963:964:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> n
+    963:964:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):964 -> n
+    963:964:boolean parseOption():460 -> n
+    965:965:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):964:964 -> n
+    965:965:boolean parseOption():460 -> n
+    966:966:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1068:1068 -> n
+    966:966:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):965 -> n
+    966:966:boolean parseOption():460 -> n
+    967:970:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):968:971 -> n
+    967:970:boolean parseOption():460 -> n
+    971:971:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):74:74 -> n
+    971:971:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):972 -> n
+    971:971:boolean parseOption():460 -> n
+    972:973:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):973:974 -> n
+    972:973:boolean parseOption():460 -> n
+    974:974:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> n
+    974:974:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):975 -> n
+    974:974:boolean parseOption():460 -> n
+    975:986:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():79:90 -> n
+    975:986:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):976 -> n
+    975:986:boolean parseOption():460 -> n
+    987:987:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):977:977 -> n
+    987:987:boolean parseOption():460 -> n
+    988:1000:void verifyAndLinkBackReferences(java.lang.Iterable):1041:1053 -> n
+    988:1000:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):977 -> n
+    988:1000:boolean parseOption():460 -> n
+    1001:1001:void verifyAndLinkBackReferences(java.lang.Iterable):1048:1048 -> n
+    1001:1001:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):977 -> n
+    1001:1001:boolean parseOption():460 -> n
+    1002:1002:boolean parseOption():0:0 -> n
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1065,"2":1066,"3":1067}}
+    1065:1065:void verifyAndLinkBackReferences(java.lang.Iterable):1048:1048 -> n
+    1065:1065:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):977 -> n
+    1065:1065:boolean parseOption():460 -> n
+    1066:1066:void verifyAndLinkBackReferences(java.lang.Iterable):1048:1048 -> n
+    1066:1066:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):977 -> n
+    1066:1066:boolean parseOption():460 -> n
+    1067:1067:void verifyAndLinkBackReferences(java.lang.Iterable):1048:1048 -> n
+    1067:1067:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):977 -> n
+    1067:1067:boolean parseOption():460 -> n
+    1003:1007:void verifyAndLinkBackReferences(java.lang.Iterable):1048:1048 -> n
+    1003:1007:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):977 -> n
+    1003:1007:boolean parseOption():460 -> n
+    1014:1016:void verifyAndLinkBackReferences(java.lang.Iterable):1055:1057 -> n
+    1014:1016:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):977 -> n
+    1014:1016:boolean parseOption():460 -> n
+    1017:1017:boolean parseOption():460:460 -> n
+    1018:1020:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):980:980 -> n
+    1018:1020:boolean parseOption():460 -> n
+    1021:1039:boolean parseOption():461:479 -> n
+    1040:1040:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> n
+    1040:1040:boolean parseOption():481 -> n
+    1041:1041:boolean parseOption():0:0 -> n
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1068,"2":1069,"3":1070,"4":1071,"5":1072,"6":1073,"7":1074}}
+    1068:1068:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> n
+    1068:1068:boolean parseOption():481 -> n
+    1069:1069:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> n
+    1069:1069:boolean parseOption():481 -> n
+    1070:1070:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> n
+    1070:1070:boolean parseOption():481 -> n
+    1071:1071:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> n
+    1071:1071:boolean parseOption():481 -> n
+    1072:1072:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> n
+    1072:1072:boolean parseOption():481 -> n
+    1073:1073:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> n
+    1073:1073:boolean parseOption():481 -> n
+    1074:1074:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> n
+    1074:1074:boolean parseOption():481 -> n
+    1042:1045:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):640:640 -> n
+    1042:1045:boolean parseOption():481 -> n
+    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2223:2242 -> o
+    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2239:2244 -> o
+    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2229:2229 -> o
+    1:1:char peekChar():1834:1834 -> p
+    1:11:void skipOptimizationName():789:799 -> q
+    1:6:void skipWhitespace():1751:1756 -> r
+    7:14:void skipComment():1762:1769 -> r
+    7:14:void skipWhitespace():1758 -> r
+com.android.tools.r8.shaking.ProguardConfigurationParserOptions -> com.android.tools.r8.shaking.T1:
+    boolean enableExperimentalCheckEnumUnboxed -> a
+    boolean enableExperimentalConvertCheckNotNull -> b
+    boolean enableExperimentalWhyAreYouNotInlining -> c
+    boolean enableTestingOptions -> d
+    1:5:void <init>(boolean,boolean,boolean,boolean):20:24 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParserOptions$Builder builder():28:28 -> a
+    1:1:boolean isExperimentalCheckEnumUnboxedEnabled():32:32 -> b
+    1:1:boolean isExperimentalConvertCheckNotNullEnabled():36:36 -> c
+    1:1:boolean isExperimentalWhyAreYouNotInliningEnabled():40:40 -> d
+    1:1:boolean isTestingOptionsEnabled():44:44 -> e
+com.android.tools.r8.shaking.ProguardConfigurationParserOptions$Builder -> com.android.tools.r8.shaking.T1$a:
+    boolean enableExperimentalCheckEnumUnboxed -> a
+    boolean enableExperimentalConvertCheckNotNull -> b
+    boolean enableExperimentalWhyAreYouNotInlining -> c
+    boolean enableTestingOptions -> d
+    1:1:void <init>():47:47 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParserOptions$Builder setEnableExperimentalCheckEnumUnboxed(boolean):71:71 -> a
+    2:2:com.android.tools.r8.shaking.ProguardConfigurationParserOptions build():93:93 -> a
+    1:10:com.android.tools.r8.shaking.ProguardConfigurationParserOptions$Builder readEnvironment():56:65 -> b
+    11:11:com.android.tools.r8.shaking.ProguardConfigurationParserOptions$Builder setEnableExperimentalConvertCheckNotNull(boolean):77:77 -> b
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParserOptions$Builder setEnableExperimentalWhyAreYouNotInlining(boolean):83:83 -> c
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParserOptions$Builder setEnableTestingOptions(boolean):88:88 -> d
+com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.shaking.V1:
     boolean used -> o
     boolean canReferenceDeadTypes -> p
     boolean $assertionsDisabled -> q
@@ -120542,16 +121560,16 @@
     13:13:java.lang.Iterable getWildcards():181 -> x
     boolean isProguardKeepRule() -> y
     1:1:boolean isUsed():64:64 -> z
-com.android.tools.r8.shaking.ProguardConfigurationRule$1 -> com.android.tools.r8.shaking.P1:
+com.android.tools.r8.shaking.ProguardConfigurationRule$1 -> com.android.tools.r8.shaking.U1:
     com.android.tools.r8.graph.AppView val$appView -> a
     com.android.tools.r8.shaking.ProguardConfigurationRule this$0 -> b
     1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.AppView):131:131 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():148:148 -> a
     1:1:com.android.tools.r8.graph.ClassResolutionResult contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):135:135 -> d
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):140:143 -> e
-com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.BP:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.TP:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.CP:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.UP:
     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>
@@ -120559,14 +121577,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.DP:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.internal.VP:
     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.EP:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.internal.WP:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -120578,50 +121596,43 @@
     1:1:java.lang.String get():42:42 -> get
     1:1:java.lang.String getName():52:52 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():57:57 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.shaking.U1:
-    1:10:void <clinit>():21:30 -> <clinit>
-    1:14:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):92:105 -> a
+com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.shaking.X1:
+    1:14:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):19:32 -> a
     15:15:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule.builder():77:77 -> a
-    15:15:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):105 -> a
+    15:15:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):32 -> a
     16:16:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    16:16:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):106 -> a
-    17:17:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):106:106 -> a
+    16:16:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):33 -> a
+    17:17:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):33:33 -> a
     18:18:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:137 -> a
-    18:18:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):107 -> a
-    19:22:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):107:110 -> a
-    23:23:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):109:109 -> a
-    24:36:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):108:120 -> a
-    37:40:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):118:121 -> a
-    41:41:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):112:112 -> a
-    42:53:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):111:122 -> a
+    18:18:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):34 -> a
+    19:22:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):34:37 -> a
+    23:23:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):36:36 -> a
+    24:36:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):35:47 -> a
+    37:40:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):45:48 -> a
+    41:41:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):39:39 -> a
+    42:53:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):38:49 -> a
     54:64:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder.build():26:36 -> a
-    54:64:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):122 -> a
-    65:110:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):131:176 -> a
-com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.shaking.R1:
-    1:1:void <init>(com.android.tools.r8.origin.Origin):22:22 -> <init>
-    1:1:java.lang.String part():25:25 -> part
-com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.shaking.S1:
-    1:1:void <init>(com.android.tools.r8.origin.Origin):30:30 -> <init>
-    1:1:java.lang.String part():33:33 -> part
-com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.shaking.T1:
+    54:64:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):49 -> a
+    65:110:boolean hasExplicitAssumeValuesOrAssumeNoSideEffectsRuleForMinSdk(com.android.tools.r8.graph.DexItemFactory,java.util.List):58:103 -> a
+com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.shaking.W1:
     com.android.tools.r8.utils.AndroidApiLevel val$apiLevel -> f
-    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApiLevel):93:93 -> <init>
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApiLevel):20:20 -> <init>
     1:1:java.lang.String part():0:0 -> part
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":98,"2":99,"3":100}}
-    98:98:java.lang.String part():96:96 -> part
-    99:99:java.lang.String part():96:96 -> part
-    100:100:java.lang.String part():96:96 -> part
-    97:97:java.lang.String part():96:96 -> part
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.shaking.W1:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":25,"2":26,"3":27}}
+    25:25:java.lang.String part():23:23 -> part
+    26:26:java.lang.String part():23:23 -> part
+    27:27:java.lang.String part():23:23 -> part
+    24:24:java.lang.String part():23:23 -> part
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.shaking.Z1:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):56:56 -> <init>
     1:1:java.lang.String typeString():78:78 -> C
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.shaking.V1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.shaking.Y1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):12:12 -> <init>
     2:2:void <init>():15:15 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.shaking.a2:
+com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.shaking.d2:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> u
     java.util.Set preconditions -> t
     int $r8$clinit -> y
@@ -120682,20 +121693,20 @@
     1:1:java.lang.Iterable getWildcards():141:141 -> x
     2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> x
     2:2:java.lang.Iterable getWildcards():141 -> x
-com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.shaking.X1:
+com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.shaking.a2:
     1:1:void <init>(com.android.tools.r8.origin.Origin):22:22 -> <init>
     1:1:java.lang.String part():25:25 -> part
-com.android.tools.r8.shaking.ProguardIfRule$2 -> com.android.tools.r8.shaking.Y1:
+com.android.tools.r8.shaking.ProguardIfRule$2 -> com.android.tools.r8.shaking.b2:
     1:1:void <init>(com.android.tools.r8.origin.Origin):30:30 -> <init>
     1:1:java.lang.String part():33:33 -> part
-com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.shaking.Z1:
+com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.shaking.c2:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> r
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():60:60 -> <clinit>
     1:1:void <init>():65:65 -> <init>
     2:2:void <init>():62:62 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.FP:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.XP:
     boolean runtimeInvisibleAnnotations -> m
     boolean runtimeVisibleParameterAnnotations -> n
     boolean runtimeInvisibleParameterAnnotations -> o
@@ -120728,7 +121739,7 @@
     1:5:boolean equals(java.lang.Object):173:177 -> equals
     1:16:int hashCode():197:212 -> hashCode
     1:1:java.lang.String toString():295:295 -> toString
-com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.shaking.c2:
+com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.shaking.f2:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):63:63 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():85:85 -> F
     1:134:void appendNonEmpty(java.lang.StringBuilder,java.lang.String,java.lang.Object,java.lang.String):0:133 -> a
@@ -120757,14 +121768,14 @@
     172:175:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):151:154 -> a
     1:5:boolean equals(java.lang.Object):115:119 -> equals
     com.android.tools.r8.shaking.ProguardKeepRule asProguardKeepRule() -> t
-com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.shaking.b2:
+com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.shaking.e2:
     1:1:void <init>(com.android.tools.r8.origin.Origin):142:142 -> <init>
     1:1:java.lang.String part():145:145 -> part
-com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.shaking.c2$a:
+com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.shaking.f2$a:
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
     1:16:com.android.tools.r8.shaking.ProguardKeepRule build():28:43 -> f
-com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.shaking.d2:
+com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.shaking.g2:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers modifiers -> s
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> r
     1:16:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):58:73 -> <init>
@@ -120774,13 +121785,13 @@
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleType getType():77:77 -> E
     1:12:boolean equals(java.lang.Object):86:97 -> equals
     1:3:int hashCode():103:105 -> hashCode
-com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.shaking.d2$a:
+com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.shaking.g2$a:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder modifiersBuilder -> q
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> p
     1:1:void <init>():21:21 -> <init>
     2:2:void <init>():18:18 -> <init>
     1:2:com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder setType(com.android.tools.r8.shaking.ProguardKeepRuleType):25:26 -> a
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.shaking.e2:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.shaking.h2:
     boolean allowsObfuscation -> e
     boolean includeDescriptorClasses -> f
     boolean allowsAccessModification -> a
@@ -120794,7 +121805,7 @@
     1:5:boolean equals(java.lang.Object):98:102 -> equals
     1:6:int hashCode():112:117 -> hashCode
     1:8:java.lang.String toString():122:129 -> toString
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.shaking.e2$a:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.shaking.h2$a:
     boolean allowsObfuscation -> e
     boolean includeDescriptorClasses -> f
     boolean allowsAccessModification -> a
@@ -120811,7 +121822,7 @@
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder setAllowsOptimization(boolean):34:34 -> e
     1:1:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder setAllowsShrinking(boolean):29:29 -> f
     1:1:void setIncludeDescriptorClasses(boolean):44:44 -> g
-com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.HP:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.ZP:
     com.android.tools.r8.shaking.ProguardKeepRuleType[] $VALUES -> f
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP -> b
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASS_MEMBERS -> c
@@ -120826,10 +121837,10 @@
     13:13:java.lang.String toString():22:22 -> toString
     14:14:java.lang.String toString():20:20 -> toString
     15:15:java.lang.String toString():18:18 -> toString
-com.android.tools.r8.shaking.ProguardKeepRuleType$1 -> com.android.tools.r8.internal.GP:
+com.android.tools.r8.shaking.ProguardKeepRuleType$1 -> com.android.tools.r8.internal.YP:
     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.g2:
+com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.shaking.j2:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     java.util.List annotations -> a
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
@@ -120873,10 +121884,10 @@
     40:49:java.lang.String toString():412:421 -> toString
     50:68:java.lang.String toString():409:427 -> toString
     69:103:java.lang.String toString():406:440 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.shaking.f2:
+com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.shaking.i2:
     int[] $SwitchMap$com$android$tools$r8$shaking$ProguardMemberType -> a
     1:1:void <clinit>():190:190 -> <clinit>
-com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.shaking.g2$a:
+com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.shaking.j2$a:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     java.util.List annotations -> a
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
@@ -120900,35 +121911,81 @@
     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
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.shaking.h2:
+    1:1:boolean isValid():91:91 -> d
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.shaking.k2:
+    com.android.tools.r8.ir.analysis.type.Nullability nullability -> f
     com.android.tools.r8.utils.LongInterval longInterval -> c
+    com.android.tools.r8.graph.DexString fieldName -> e
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type type -> a
-    boolean $assertionsDisabled -> e
-    com.android.tools.r8.graph.DexField field -> d
+    com.android.tools.r8.graph.DexType fieldHolder -> d
+    boolean $assertionsDisabled -> g
     boolean booleanValue -> b
-    1:1:void <clinit>():10:10 -> <clinit>
-    1:5:void <init>(boolean):23:27 -> <init>
-    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:1:boolean isBoolean():52:52 -> e
-    1:1:boolean isField():60:60 -> f
-    1:1:boolean isNull():68:68 -> g
-    1:1:boolean isSingleValue():82:82 -> h
-    1:1:boolean isValueRange():56:56 -> i
+    1:1:void <clinit>():21:21 -> <clinit>
+    1:7:void <init>(boolean):37:43 -> <init>
+    8:15:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.analysis.type.Nullability):47:54 -> <init>
+    16:23:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):57:64 -> <init>
+    24:30:void <init>(com.android.tools.r8.utils.LongInterval):67:73 -> <init>
+    1:1:boolean com.android.tools.r8.utils.LongInterval.isSingleValue(int):40:40 -> a
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullabilityForValueRange(com.android.tools.r8.utils.LongInterval):77 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    2:2:boolean com.android.tools.r8.utils.LongInterval.isSingleValue(int):40:40 -> a
+    2:2:com.android.tools.r8.ir.analysis.type.Nullability getNullabilityForValueRange(com.android.tools.r8.utils.LongInterval):77 -> a
+    3:7:com.android.tools.r8.ir.analysis.type.Nullability getNullabilityForValueRange(com.android.tools.r8.utils.LongInterval):78:82 -> a
+    8:9:boolean getBoolean():103:104 -> a
+    10:43:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):132:165 -> a
+    44:44:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":268,"2":269,"3":270}}
+    268:268:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):165:165 -> a
+    269:269:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):165:165 -> a
+    270:270:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):165:165 -> a
+    209:209:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):165:165 -> a
+    210:213:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):154:157 -> a
+    214:214:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> a
+    214:214:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):157 -> a
+    215:218:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):159:162 -> a
+    219:219:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):161:161 -> a
+    220:220:com.android.tools.r8.ir.analysis.value.NumberFromIntervalValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNumberFromIntervalValue(long,long):36:36 -> a
+    220:220:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):161 -> a
+    221:223:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):149:151 -> a
+    224:224:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> a
+    224:224:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):151 -> a
+    225:230:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):138:143 -> a
+    231:231:com.android.tools.r8.ir.analysis.value.objectstate.ObjectState com.android.tools.r8.ir.analysis.value.objectstate.ObjectState.empty():28:28 -> a
+    231:231:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):143 -> a
+    232:236:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):142:146 -> a
+    237:237:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> a
+    237:237:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):146 -> a
+    238:238:com.android.tools.r8.ir.analysis.value.AbstractValue toAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):135:135 -> a
+    271:271:com.android.tools.r8.ir.analysis.type.DynamicType toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):170:170 -> a
+    272:272:boolean hasNullability():118:118 -> a
+    272:272:com.android.tools.r8.ir.analysis.type.DynamicType toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):170 -> a
+    273:274:com.android.tools.r8.ir.analysis.type.DynamicType toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):170:171 -> a
+    275:275:com.android.tools.r8.ir.analysis.type.NotNullDynamicType com.android.tools.r8.ir.analysis.type.DynamicType.definitelyNotNull():87:87 -> a
+    275:275:com.android.tools.r8.ir.analysis.type.DynamicType toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):171 -> a
+    276:276:com.android.tools.r8.ir.analysis.type.DynamicType toDynamicType(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):172:172 -> a
+    1:2:com.android.tools.r8.graph.DexType getFieldHolder():108:109 -> b
+    1:2:com.android.tools.r8.graph.DexString getFieldName():113:114 -> c
+    1:1:com.android.tools.r8.ir.analysis.type.Nullability getNullability():122:122 -> d
+    2:2:boolean hasNullability():118:118 -> d
+    2:2:com.android.tools.r8.ir.analysis.type.Nullability getNullability():122 -> d
+    3:4:com.android.tools.r8.ir.analysis.type.Nullability getNullability():122:123 -> d
+    1:2:com.android.tools.r8.utils.LongInterval getValueRange():127:128 -> e
+    1:1:boolean isBoolean():87:87 -> f
+    1:1:boolean isField():91:91 -> g
+    1:1:boolean isNullability():95:95 -> h
+    1:1:boolean isValueRange():99:99 -> i
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":133,"2":134,"3":135}}
-    133:133:java.lang.String toString():115:115 -> toString
-    134:134:java.lang.String toString():115:115 -> toString
-    135:135:java.lang.String toString():116:116 -> toString
-    118:132:java.lang.String toString():117:131 -> toString
-com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.UP:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":198,"2":199,"3":200}}
+    198:198:java.lang.String toString():177:177 -> toString
+    199:199:java.lang.String toString():177:177 -> toString
+    200:200:java.lang.String toString():178:178 -> toString
+    180:197:java.lang.String toString():179:196 -> toString
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.mQ:
+# {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
+# {"id":"com.android.tools.r8.synthesized"}
+    java.lang.String stringValueOf(int) -> a
+      # {"id":"com.android.tools.r8.synthesized"}
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.nQ:
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> h
     com.android.tools.r8.shaking.ProguardMemberType INIT -> g
     com.android.tools.r8.shaking.ProguardMemberType CLINIT -> f
@@ -120944,7 +122001,7 @@
     1:1:boolean includesFields():18:18 -> a
     1:1:boolean includesMethods():22:22 -> b
     1:1:com.android.tools.r8.shaking.ProguardMemberType[] values():6:6 -> c
-com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.shaking.l2:
+com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.shaking.o2:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.shaking.ProguardNameMatcher MATCH_ALL_NAMES -> a
     1:3:void <clinit>():14:16 -> <clinit>
@@ -120963,14 +122020,14 @@
     68:112:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):43:87 -> a
     113:113:java.lang.Iterable getWildcards():93:93 -> a
     114:114:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardNameMatcher):97:97 -> a
-    115:115:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2304:2304 -> a
+    115:115:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2370:2370 -> a
     115:115:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):23 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    116:116:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2304:2304 -> a
+    116:116:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2370:2370 -> a
     116:116:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):23 -> a
     117:121: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
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.shaking.i2:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.shaking.l2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> c
     1:1:void <init>():108:108 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardWildcard):111:112 -> <init>
@@ -120979,7 +122036,7 @@
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames materialize():128:128 -> b
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher materialize():104 -> b
     1:1:java.lang.String toString():133:133 -> toString
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.shaking.j2:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.shaking.m2:
     java.util.List wildcards -> d
     java.lang.String pattern -> c
     1:3:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):142:144 -> <init>
@@ -120990,14 +122047,14 @@
     1:1:boolean equals(java.lang.Object):180:180 -> equals
     1:1:int hashCode():185:185 -> hashCode
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.shaking.k2:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.shaking.n2:
     java.lang.String name -> c
     1:2:void <init>(java.lang.String):193:194 -> <init>
     1:1:boolean matches(java.lang.String):199:199 -> a
     1:1:boolean equals(java.lang.Object):209:209 -> equals
     1:1:int hashCode():214:214 -> hashCode
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.VP:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.oQ:
     java.lang.String pattern -> a
     1:2:void <init>(java.lang.String):10:11 -> <init>
     1:1:boolean matches(java.lang.String):15:15 -> a
@@ -121009,7 +122066,7 @@
     57:86:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):42:71 -> a
     1:5:boolean equals(java.lang.Object):83:87 -> equals
     1:1:int hashCode():92:92 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.shaking.m2:
+com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.shaking.p2:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap packageNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardPackageNameList$1):13:13 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):40:41 -> <init>
@@ -121022,14 +122079,14 @@
     8:11:boolean matches(com.android.tools.r8.graph.ProgramPackage):64 -> a
     1:15:boolean equals(java.lang.Object):83:97 -> equals
     1:6:int hashCode():107:112 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.shaking.m2$a:
+com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.shaking.p2$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPackageNameList$1):19:19 -> <init>
     2:2:void <init>():25:25 -> <init>
     3:3:void <init>():22:22 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder addPackageName(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):29:29 -> a
     2:2:com.android.tools.r8.shaking.ProguardPackageNameList build():34:34 -> a
-com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.shaking.o2:
+com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.shaking.r2:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> b
     boolean $assertionsDisabled -> c
@@ -121039,7 +122096,7 @@
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder builder():14:14 -> a
     2:4:boolean matches(java.lang.String):59:61 -> a
     1:1:boolean isEnabled():55:55 -> b
-com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.shaking.n2:
+com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.shaking.q2:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> b
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathFilter$1):17:17 -> <init>
@@ -121049,12 +122106,12 @@
     2:2:com.android.tools.r8.shaking.ProguardPathFilter build():40:40 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder disable():30:30 -> b
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder enable():35:35 -> c
-com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.shaking.t2:
+com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.shaking.w2:
     1:1:void <init>():10:10 -> <init>
     boolean matches(java.lang.String) -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList emptyList():17:17 -> b
-com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.shaking.p2:
+com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.shaking.s2:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):22:22 -> <init>
     2:2:void <init>():26:26 -> <init>
@@ -121062,11 +122119,11 @@
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String):30:30 -> a
     2:2:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String,boolean):34:34 -> a
     1:5:com.android.tools.r8.shaking.ProguardPathList build():39:43 -> b
-com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.shaking.q2:
+com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.shaking.t2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):122:122 -> <init>
     2:2:void <init>():124:124 -> <init>
     boolean matches(java.lang.String) -> a
-com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.shaking.r2:
+com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.shaking.u2:
     boolean negated -> a
     java.lang.String pattern -> b
     1:3:void <init>(boolean,java.lang.String):52:54 -> <init>
@@ -121081,12 +122138,12 @@
     35:35:boolean containsSeparatorsStartingAt(java.lang.String,int):98:98 -> a
     35:35:boolean matchImpl(java.lang.String,int,java.lang.String,int):70 -> a
     36:57:boolean matchImpl(java.lang.String,int,java.lang.String,int):73:94 -> a
-com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.shaking.s2:
+com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.shaking.v2:
     java.util.List matchers -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardPathList$1):103:103 -> <init>
     2:3:void <init>(java.util.List):106:107 -> <init>
     1:4:boolean matches(java.lang.String):112:115 -> a
-com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.WP:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.pQ:
     com.android.tools.r8.position.Position position -> e
     com.android.tools.r8.origin.Origin origin -> d
     java.lang.String snippet -> c
@@ -121096,7 +122153,7 @@
     1:1:java.lang.String getMessage():48:48 -> getMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
-com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.shaking.u2:
+com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.shaking.x2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher$1):23:23 -> <init>
     2:2:void <init>():31:31 -> <init>
     com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType asSpecificTypeMatcher() -> a
@@ -121113,12 +122170,12 @@
     com.android.tools.r8.graph.DexType getSpecificType() -> b
     boolean matches(com.android.tools.r8.graph.DexType) -> b
     1:1:java.lang.Iterable getWildcards():59:59 -> c
-com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.shaking.u2$a:
+com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.shaking.x2$a:
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType TYPE -> c
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType CLASS -> b
     1:2:void <clinit>():35:36 -> <clinit>
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.shaking.v2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.shaking.y2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ALL_TYPES -> b
     1:1:void <clinit>():152:152 -> <clinit>
@@ -121134,7 +122191,7 @@
     1:1:boolean equals(java.lang.Object):187:187 -> equals
     1:1:int hashCode():192:192 -> hashCode
     1:1:java.lang.String toString():182:182 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.shaking.w2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.shaking.z2:
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ANY_ARG_SEQUENCE -> a
     1:1:void <clinit>():198:198 -> <clinit>
     1:1:void <init>():196:196 -> <init>
@@ -121143,7 +122200,7 @@
     1:1:boolean equals(java.lang.Object):217:217 -> equals
     1:1:int hashCode():222:222 -> hashCode
     1:1:java.lang.String toString():207:207 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.shaking.x2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.shaking.A2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_BASIC_TYPES -> b
     1:1:void <clinit>():283:283 -> <clinit>
@@ -121159,7 +122216,7 @@
     1:1:boolean equals(java.lang.Object):321:321 -> equals
     1:1:int hashCode():326:326 -> hashCode
     1:1:java.lang.String toString():316:316 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.shaking.y2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.shaking.B2:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> b
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_CLASS_TYPES -> c
     boolean $assertionsDisabled -> e
@@ -121177,7 +122234,7 @@
     1:1:boolean equals(java.lang.Object):272:272 -> equals
     1:1:int hashCode():277:277 -> hashCode
     1:1:java.lang.String toString():267:267 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.shaking.u2$b:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.shaking.x2$b:
     com.android.tools.r8.graph.DexType type -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardTypeMatcher$1):330:330 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):334:335 -> <init>
@@ -121187,7 +122244,7 @@
     1:2:boolean equals(java.lang.Object):355:356 -> equals
     1:1:int hashCode():363:363 -> hashCode
     1:1:java.lang.String toString():350:350 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.shaking.z2:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.shaking.C2:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType kind -> c
@@ -121204,7 +122261,7 @@
     10:18:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):414:422 -> a
     19:36:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):442:459 -> a
     19:36:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):423 -> a
-    37:39:boolean com.android.tools.r8.utils.StringUtils.onlyContainsDigits(java.lang.String):319:321 -> a
+    37:39:boolean com.android.tools.r8.utils.StringUtils.onlyContainsDigits(java.lang.String):327:329 -> a
     37:39:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):459 -> a
     37:39:com.android.tools.r8.shaking.ProguardTypeMatcher materialize(com.android.tools.r8.graph.DexItemFactory):423 -> a
     40:65:java.lang.String removeMaterializedBackReferencesFromPattern(java.lang.String,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):463:488 -> a
@@ -121233,16 +122290,16 @@
     1:3:boolean equals(java.lang.Object):618:620 -> equals
     1:1:int hashCode():627:627 -> hashCode
     1:1:java.lang.String toString():613:613 -> toString
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.shaking.B2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.shaking.E2:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     1:1:java.lang.String typeString():79:79 -> C
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.shaking.A2:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.shaking.D2:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
-com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.shaking.C2:
+com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.shaking.F2:
     1:1:void <init>():8:8 -> <init>
     com.android.tools.r8.shaking.ProguardWildcard$BackReference asBackReference() -> a
     void setCaptured(java.lang.String) -> a
@@ -121251,7 +122308,7 @@
     boolean isBackReference() -> d
     boolean isPattern() -> e
     com.android.tools.r8.shaking.ProguardWildcard materialize() -> f
-com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.shaking.C2$a:
+com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.shaking.F2$a:
     int referenceIndex -> b
     com.android.tools.r8.shaking.ProguardWildcard$Pattern reference -> a
     1:2:void <init>(int):85:86 -> <init>
@@ -121273,7 +122330,7 @@
     265:265:java.lang.String toString():130:130 -> toString
     266:266:java.lang.String toString():130:130 -> toString
     267:267:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.shaking.C2$b:
+com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.shaking.F2$b:
     java.lang.String pattern -> a
     java.lang.String captured -> b
     1:1:void <init>(java.lang.String):35:35 -> <init>
@@ -121288,7 +122345,7 @@
     6:6:void setCaptured(java.lang.String):41:41 -> h
     6:6:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():60 -> h
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.shaking.ReprocessClassInitializerRule -> com.android.tools.r8.shaking.E2:
+com.android.tools.r8.shaking.ReprocessClassInitializerRule -> com.android.tools.r8.shaking.H2:
     int $r8$clinit -> s
     com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type type -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.shaking.ReprocessClassInitializerRule$1):11:11 -> <init>
@@ -121297,14 +122354,14 @@
     8:8:java.lang.String typeString():113:113 -> C
     1:1:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type getType():96:96 -> D
     com.android.tools.r8.shaking.ReprocessClassInitializerRule asReprocessClassInitializerRule() -> u
-com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder -> com.android.tools.r8.shaking.D2:
+com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder -> com.android.tools.r8.shaking.G2:
     com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.ReprocessClassInitializerRule$1):18:18 -> <init>
     2:2:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder setType(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type):28:28 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
     1:11:com.android.tools.r8.shaking.ReprocessClassInitializerRule build():39:49 -> f
-com.android.tools.r8.shaking.ReprocessMethodRule -> com.android.tools.r8.shaking.G2:
+com.android.tools.r8.shaking.ReprocessMethodRule -> com.android.tools.r8.shaking.J2:
     com.android.tools.r8.shaking.ReprocessMethodRule$Type type -> r
     int $r8$clinit -> s
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.shaking.ReprocessMethodRule$1):11:11 -> <init>
@@ -121313,69 +122370,67 @@
     8:8:java.lang.String typeString():113:113 -> C
     1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Type getType():96:96 -> D
     com.android.tools.r8.shaking.ReprocessMethodRule asReprocessMethodRule() -> v
-com.android.tools.r8.shaking.ReprocessMethodRule$Builder -> com.android.tools.r8.shaking.F2:
+com.android.tools.r8.shaking.ReprocessMethodRule$Builder -> com.android.tools.r8.shaking.I2:
     com.android.tools.r8.shaking.ReprocessMethodRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.ReprocessMethodRule$1):18:18 -> <init>
     2:2:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Builder setType(com.android.tools.r8.shaking.ReprocessMethodRule$Type):28:28 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
     1:11:com.android.tools.r8.shaking.ReprocessMethodRule build():39:49 -> f
-com.android.tools.r8.shaking.RootSetUtils -> com.android.tools.r8.internal.gW:
-com.android.tools.r8.shaking.RootSetUtils$1 -> com.android.tools.r8.shaking.H2:
+com.android.tools.r8.shaking.RootSetUtils -> com.android.tools.r8.internal.BW:
+com.android.tools.r8.shaking.RootSetUtils$1 -> com.android.tools.r8.shaking.K2:
     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$ProguardKeepRuleType -> a
     1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Type[] com.android.tools.r8.shaking.ReprocessMethodRule$Type.values():13:13 -> <clinit>
-    1:1:void <clinit>():1334 -> <clinit>
-    2:2:void <clinit>():1334:1334 -> <clinit>
+    1:1:void <clinit>():1324 -> <clinit>
+    2:2:void <clinit>():1324:1324 -> <clinit>
     3:3:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type[] com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type.values():13:13 -> <clinit>
-    3:3:void <clinit>():1319 -> <clinit>
-    4:4:void <clinit>():1319:1319 -> <clinit>
+    3:3:void <clinit>():1309 -> <clinit>
+    4:4:void <clinit>():1309:1309 -> <clinit>
     5:5:com.android.tools.r8.shaking.MemberValuePropagationRule$Type[] com.android.tools.r8.shaking.MemberValuePropagationRule$Type.values():13:13 -> <clinit>
-    5:5:void <clinit>():1293 -> <clinit>
-    6:6:void <clinit>():1293:1293 -> <clinit>
+    5:5:void <clinit>():1283 -> <clinit>
+    6:6:void <clinit>():1283:1283 -> <clinit>
     7:7:com.android.tools.r8.shaking.ClassInlineRule$Type[] com.android.tools.r8.shaking.ClassInlineRule$Type.values():13:13 -> <clinit>
-    7:7:void <clinit>():1237 -> <clinit>
-    8:8:void <clinit>():1237:1237 -> <clinit>
+    7:7:void <clinit>():1227 -> <clinit>
+    8:8:void <clinit>():1227:1227 -> <clinit>
     9:9:com.android.tools.r8.shaking.InlineRule$Type[] com.android.tools.r8.shaking.InlineRule$Type.values():13:13 -> <clinit>
-    9:9:void <clinit>():1196 -> <clinit>
-    10:10:void <clinit>():1196:1196 -> <clinit>
-    11:11:void <clinit>():211:211 -> <clinit>
-com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet -> com.android.tools.r8.shaking.I2:
-    1:1:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):2100:2100 -> <init>
-com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder -> com.android.tools.r8.shaking.J2:
-    com.android.tools.r8.shaking.Enqueuer enqueuer -> I
-    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):2067:2067 -> <init>
-    2:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer):2075:2076 -> <init>
-    1:2:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2081:2082 -> a
+    9:9:void <clinit>():1186 -> <clinit>
+    10:10:void <clinit>():1186:1186 -> <clinit>
+    11:11:void <clinit>():220:220 -> <clinit>
+com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet -> com.android.tools.r8.shaking.L2:
+    1:1:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):2186:2186 -> <init>
+com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSetBuilder -> com.android.tools.r8.shaking.M2:
+    com.android.tools.r8.shaking.Enqueuer enqueuer -> H
+    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):2153:2153 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer):2161:2162 -> <init>
+    1:2:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2167:2168 -> a
     3:3:boolean com.android.tools.r8.shaking.AnnotationMatchResult.isConcreteAnnotationMatchResult():0:0 -> a
-    3:3:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2082 -> a
-    4:6:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2083:2083 -> a
-com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet -> com.android.tools.r8.shaking.K2:
-    boolean $assertionsDisabled -> x
-    1:1:void <clinit>():2143:2143 -> <clinit>
-    1:20:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2153:2172 -> <init>
-    21:21:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2150:2150 -> <init>
+    3:3:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2168 -> a
+    4:6:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):2169:2169 -> a
+com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet -> com.android.tools.r8.shaking.N2:
+    boolean $assertionsDisabled -> v
+    1:1:void <clinit>():2229:2229 -> <clinit>
+    1:18:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2239:2256 -> <init>
+    19:19:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.List):2236:2236 -> <init>
     void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition) -> a
-    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):2143:2143 -> a
-    2:2:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2179:2179 -> a
-    3:3:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexReference):2196:2196 -> a
-    1:16:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):2189:2204 -> b
-    17:26:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):2210:2219 -> b
-com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder -> com.android.tools.r8.shaking.L2:
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable,com.android.tools.r8.shaking.RootSetUtils$1):2117:2117 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2123:2123 -> <init>
-    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):2117:2117 -> a
-    1:3:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet build(java.util.concurrent.ExecutorService):2134:2136 -> b
-com.android.tools.r8.shaking.RootSetUtils$RootSet -> com.android.tools.r8.shaking.M2:
+    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):2229:2229 -> a
+    2:2:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2263:2263 -> a
+    3:3:void lambda$rewrittenWithLens$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexReference):2280:2280 -> a
+    1:16:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):2273:2288 -> b
+    17:26:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet withoutPrunedItems(com.android.tools.r8.graph.PrunedItems):2294:2303 -> b
+com.android.tools.r8.shaking.RootSetUtils$MainDexRootSetBuilder -> com.android.tools.r8.shaking.O2:
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable,com.android.tools.r8.shaking.RootSetUtils$1):2203:2203 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2209:2209 -> <init>
+    1:1:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):2203:2203 -> a
+    1:3:com.android.tools.r8.shaking.RootSetUtils$MainDexRootSet build(java.util.concurrent.ExecutorService):2220:2222 -> b
+com.android.tools.r8.shaking.RootSetUtils$RootSet -> com.android.tools.r8.shaking.P2:
     java.util.Map mayHaveSideEffects -> r
-    java.util.Map noSideEffects -> s
-    java.util.Map assumedValues -> t
-    java.util.Set identifierNameStrings -> u
-    java.util.Set ifRules -> v
-    boolean $assertionsDisabled -> w
+    java.util.Set identifierNameStrings -> s
+    java.util.Set ifRules -> t
+    boolean $assertionsDisabled -> u
     com.android.tools.r8.com.google.common.collect.ImmutableList reasonAsked -> g
     java.util.Set alwaysInline -> h
     com.android.tools.r8.utils.PredicateSet alwaysClassInline -> m
@@ -121387,746 +122442,781 @@
     java.util.Set reprocess -> k
     java.util.Set neverReprocess -> l
     java.util.Set noUnusedInterfaceRemoval -> n
-    1:1:void <clinit>():1701:1701 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,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,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.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.shaking.RootSetUtils$1):1701:1701 -> <init>
-    2:24:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,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,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.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1743:1765 -> <init>
+    1:1:void <clinit>():1798:1798 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,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,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.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap,com.android.tools.r8.shaking.RootSetUtils$1):1798:1798 -> <init>
+    2:22:void <init>(com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,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,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.Set,java.util.Set,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1836:1856 -> <init>
     1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    1:1:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1813 -> a
+    1:1:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1904 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    2:2:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1813 -> a
-    3:3:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1701:1701 -> a
-    3:3:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1817 -> a
-    4:9:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1817:1822 -> a
-    10:10:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1701:1701 -> a
-    10:10:void pruneItems(com.android.tools.r8.graph.PrunedItems):1845 -> a
+    2:2:boolean lambda$isShrinkingDisallowedUnconditionally$2(com.android.tools.r8.shaking.KeepInfo$Joiner):1904 -> a
+    3:3:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1798:1798 -> a
+    3:3:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1908 -> a
+    4:8:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1908:1912 -> a
+    9:9:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1798:1798 -> a
+    9:9:void pruneItems(com.android.tools.r8.graph.PrunedItems):1935 -> a
+    10:10:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
+    10:10:void pruneItems(com.android.tools.r8.graph.PrunedItems):1935 -> a
     11:11:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    11:11:void pruneItems(com.android.tools.r8.graph.PrunedItems):1845 -> a
-    12:12:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    12:12:void pruneItems(com.android.tools.r8.graph.PrunedItems):1845 -> a
+    11:11:void pruneItems(com.android.tools.r8.graph.PrunedItems):1935 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:14:void pruneItems(com.android.tools.r8.graph.PrunedItems):1847:1848 -> a
-    15:15:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1701:1701 -> a
-    15:15:void pruneItems(com.android.tools.r8.graph.PrunedItems):1849 -> a
-    16:16:void pruneItems(com.android.tools.r8.graph.PrunedItems):1849:1849 -> a
-    17:17:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1701:1701 -> a
-    17:17:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):1884 -> a
-    18:19:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):1885:1886 -> a
-    20:20:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1701:1701 -> a
-    20:20:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1890 -> a
-    21:21:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1891:1891 -> a
+    12:13:void pruneItems(com.android.tools.r8.graph.PrunedItems):1937:1938 -> a
+    14:14:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1798:1798 -> a
+    14:14:void pruneItems(com.android.tools.r8.graph.PrunedItems):1939 -> a
+    15:15:void pruneItems(com.android.tools.r8.graph.PrunedItems):1939:1939 -> a
+    16:16:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1798:1798 -> a
+    16:16:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):1972 -> a
+    17:18:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):1973:1974 -> a
+    19:19:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1798:1798 -> a
+    19:19:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1978 -> a
+    20:20:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1979:1979 -> a
+    21:21:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
+    21:21:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1979 -> a
     22:22:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    22:22:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1891 -> a
-    23:23:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> a
-    23:23:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1891 -> a
+    22:22:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1979 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:25:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1891:1892 -> a
-    26:31:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1769:1774 -> a
-    32:32:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
-    32:32:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1774 -> a
-    33:46:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1775:1788 -> a
-    47:54:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):1794:1801 -> a
-    55:55:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1799:1799 -> a
-    56:57:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1799:1800 -> a
-    58:58:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1806:1806 -> a
-    59:59:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1701:1701 -> a
-    59:59:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1809 -> a
-    60:62:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1810:1812 -> a
-    63:63:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1811:1811 -> a
-    64:64:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1829:1829 -> a
-    65:65:boolean lambda$pruneDeadReferences$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1833:1833 -> a
-    66:73:boolean lambda$pruneDeadReferences$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1832:1839 -> a
-    74:74:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1835:1835 -> a
-    75:75:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):557:557 -> a
+    23:24:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.graph.AppView):1979:1980 -> a
+    25:30:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1860:1865 -> a
+    31:31:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
+    31:31:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1865 -> a
+    32:45:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1866:1879 -> a
+    46:53:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet):1885:1892 -> a
+    54:54:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1890:1890 -> a
+    55:56:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1890:1891 -> a
+    57:57:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1897:1897 -> a
+    58:58:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1798:1798 -> a
+    58:58:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1900 -> a
+    59:61:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1901:1903 -> a
+    62:62:boolean isShrinkingDisallowedUnconditionally(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.utils.InternalOptions):1902:1902 -> a
+    63:63:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1919:1919 -> a
+    64:64:boolean lambda$pruneDeadReferences$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1923:1923 -> a
+    65:72:boolean lambda$pruneDeadReferences$5(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1922:1929 -> a
+    73:73:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1925:1925 -> a
+    74:74:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):571:571 -> a
+    74:74:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
+    74:74:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1925 -> a
+    75:75:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):575:575 -> a
+    75:75:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):571 -> a
     75:75:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
-    75:75:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1835 -> a
-    76:76:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.toClassFieldOrNull(com.android.tools.r8.graph.DexEncodedField):561:561 -> a
-    76:76:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexClass.lookupClassField(com.android.tools.r8.graph.DexField):557 -> a
-    76:76:com.android.tools.r8.graph.DexClassAndField com.android.tools.r8.graph.DexField.lookupMemberOnClass(com.android.tools.r8.graph.DexClass):84 -> a
-    76:76:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1835 -> a
-    77:77:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1838:1838 -> a
-    78:78:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1837:1837 -> a
-    79:82:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):1855:1858 -> a
-    83:83:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1701:1701 -> a
-    83:83:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):1859 -> a
-    84:84:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):1859:1859 -> a
-    85:85:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1894:1894 -> a
-    86:86:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    86:86:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1894 -> a
+    75:75:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$3(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexField):1925 -> a
+    76:76:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1928:1928 -> a
+    77:77:com.android.tools.r8.graph.Definition lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod):1927:1927 -> a
+    78:81:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):1945:1948 -> a
+    82:82:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1798:1798 -> a
+    82:82:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):1949 -> a
+    83:83:com.android.tools.r8.shaking.RootSetUtils$RootSet rewrittenWithLens(com.android.tools.r8.graph.GraphLens):1949:1949 -> a
+    84:84:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1982:1982 -> a
+    85:85:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
+    85:85:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1982 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    87:87:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
-    87:87:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1894 -> a
-    88:90:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1896:1898 -> a
-    91:91:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
-    91:91:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1898 -> a
-    92:92:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1898:1898 -> a
-    93:93:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexField.lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):89:89 -> a
-    93:93:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1899 -> a
-    94:96:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1901:1903 -> a
-    97:97:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3911,"2":3912,"3":3913}}
-    3911:3911:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1903:1903 -> a
-    3912:3912:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1903:1903 -> a
-    3913:3913:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1903:1903 -> a
-    2001:2002:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1904:1905 -> a
-    2003:2003:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3915,"2":3916,"3":3917}}
-    3915:3915:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1905:1905 -> a
-    3916:3916:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1905:1905 -> a
-    3917:3917:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1905:1905 -> a
-    3910:3910:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1907:1907 -> a
-    3918:3926:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1952:1960 -> a
-    3927:3927:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1974:1974 -> a
-    3928:3928:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    3928:3928:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1974 -> a
-    3929:3930:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1975:1976 -> a
-    3931:3931:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7900,"2":7901,"3":7902}}
-    7900:7900:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1976:1976 -> a
-    7901:7901:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1976:1976 -> a
-    7902:7902:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1976:1976 -> a
-    3932:3932:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7903,"2":7904,"3":7905,"4":7906}}
-    7903:7903:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1977:1977 -> a
-    7904:7904:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1977:1977 -> a
-    7905:7905:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1977:1977 -> a
-    7906:7906:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1977:1977 -> a
-    5909:5913:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1977:1981 -> a
-    5914:5914:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":7910,"2":7911,"3":7912}}
-    7910:7910:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1981:1981 -> a
-    7911:7911:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1981:1981 -> a
-    7912:7912:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1981:1981 -> a
-    7896:7899:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1982:1985 -> a
-    7913:7913:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2063:2063 -> a
+    86:86:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> a
+    86:86:boolean lambda$verifyKeptFieldsAreAccessedAndLive$6(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1982 -> a
+    87:89:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1984:1986 -> a
+    90:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
+    90:90:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1986 -> a
+    91:91:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1986:1986 -> a
+    92:92:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexField.lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):89:89 -> a
+    92:92:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1987 -> a
+    93:95:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1989:1991 -> a
+    96:96:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4086,"2":4087,"3":4088}}
+    4086:4086:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1991:1991 -> a
+    4087:4087:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1991:1991 -> a
+    4088:4088:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1991:1991 -> a
+    2088:2089:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1992:1993 -> a
+    2090:2090:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4090,"2":4091,"3":4092}}
+    4090:4090:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1993:1993 -> a
+    4091:4091:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1993:1993 -> a
+    4092:4092:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1993:1993 -> a
+    4085:4085:void lambda$verifyKeptFieldsAreAccessedAndLive$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1995:1995 -> a
+    4093:4101:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2040:2048 -> a
+    4102:4102:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2062:2062 -> a
+    4103:4103:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    4103:4103:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2062 -> a
+    4104:4105:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2063:2064 -> a
+    4106:4106:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8251,"2":8252,"3":8253}}
+    8251:8251:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2064:2064 -> a
+    8252:8252:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2064:2064 -> a
+    8253:8253:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2064:2064 -> a
+    4107:4107:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8254,"2":8255,"3":8256,"4":8257}}
+    8254:8254:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2065:2065 -> a
+    8255:8255:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2065:2065 -> a
+    8256:8256:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2065:2065 -> a
+    8257:8257:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2065:2065 -> a
+    6172:6176:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2065:2069 -> a
+    6177:6177:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8261,"2":8262,"3":8263}}
+    8261:8261:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2069:2069 -> a
+    8262:8262:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2069:2069 -> a
+    8263:8263:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2069:2069 -> a
+    8247:8250:void lambda$verifyKeptItemsAreKept$15(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2070:2073 -> a
+    8264:8264:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder builder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):2149:2149 -> a
     1:1:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> b
-    1:1:boolean lambda$verifyKeptItemsAreKept$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1972 -> b
+    1:1:boolean lambda$verifyKeptItemsAreKept$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2060 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2:2:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> b
-    2:2:boolean lambda$verifyKeptItemsAreKept$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1972 -> b
-    3:4:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1921:1922 -> b
+    2:2:boolean lambda$verifyKeptItemsAreKept$12(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2060 -> b
+    3:4:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2009:2010 -> b
     5:5:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3867,"2":3868,"3":3869}}
-    3867:3867:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1922:1922 -> b
-    3868:3868:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1922:1922 -> b
-    3869:3869:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1922:1922 -> b
-    1928:1930:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1923:1925 -> b
-    1931:1931:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> b
-    1931:1931:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1925 -> b
-    1932:1935:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1925:1928 -> b
-    1936:1936:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":3875,"2":3876,"3":3877}}
-    3875:3875:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1928:1928 -> b
-    3876:3876:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1928:1928 -> b
-    3877:3877:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1928:1928 -> b
-    3866:3866:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1930:1930 -> b
-    3878:3880:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1966:1968 -> b
-    3881:3881:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1701:1701 -> b
-    3881:3881:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1969 -> b
-    3882:3882:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1970:1970 -> b
-    3883:3883:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
-    3883:3883:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1970 -> b
-    3884:3884:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
-    3884:3884:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1970 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4043,"2":4044,"3":4045}}
+    4043:4043:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2010:2010 -> b
+    4044:4044:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2010:2010 -> b
+    4045:4045:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2010:2010 -> b
+    2016:2018:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2011:2013 -> b
+    2019:2019:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> b
+    2019:2019:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2013 -> b
+    2020:2023:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2013:2016 -> b
+    2024:2024:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4051,"2":4052,"3":4053}}
+    4051:4051:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2016:2016 -> b
+    4052:4052:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2016:2016 -> b
+    4053:4053:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2016:2016 -> b
+    4042:4042:void lambda$verifyKeptMethodsAreTargetedAndLive$9(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2018:2018 -> b
+    4054:4056:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2054:2056 -> b
+    4057:4057:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1798:1798 -> b
+    4057:4057:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2057 -> b
+    4058:4058:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2058:2058 -> b
+    4059:4059:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
+    4059:4059:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2058 -> b
+    4060:4060:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
+    4060:4060:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2058 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3885:3922:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):1970:2007 -> b
-    3923:3923:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10018,"2":10019,"3":10020}}
-    10018:10018:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2007:2007 -> b
-    10019:10019:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2007:2007 -> b
-    10020:10020:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2007:2007 -> b
-    5932:5943:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2009:2020 -> b
-    5944:5944:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10033,"2":10034,"3":10035}}
-    10033:10033:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2020:2020 -> b
-    10034:10034:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2020:2020 -> b
-    10035:10035:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2020:2020 -> b
-    7966:7979:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2022:2035 -> b
-    7980:7980:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10050,"2":10051,"3":10052}}
-    10050:10050:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2035:2035 -> b
-    10051:10051:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2035:2035 -> b
-    10052:10052:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2035:2035 -> b
-    7981:7981:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10053,"2":10054,"3":10055,"4":10056}}
-    10053:10053:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2036:2036 -> b
-    10054:10054:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2036:2036 -> b
-    10055:10055:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2036:2036 -> b
-    10056:10056:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2036:2036 -> b
-    10017:10017:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2036:2036 -> b
-    10057:10057:java.util.Set lambda$verifyKeptItemsAreKept$13(com.android.tools.r8.graph.DexType):1978:1978 -> b
-    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1701:1701 -> c
-    1:1:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1915 -> c
-    2:2:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1916:1916 -> c
+    4061:4098:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2058:2095 -> b
+    4099:4099:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10458,"2":10459,"3":10460}}
+    10458:10458:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2095:2095 -> b
+    10459:10459:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2095:2095 -> b
+    10460:10460:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2095:2095 -> b
+    6196:6207:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2097:2108 -> b
+    6208:6208:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10473,"2":10474,"3":10475}}
+    10473:10473:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2108:2108 -> b
+    10474:10474:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2108:2108 -> b
+    10475:10475:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2108:2108 -> b
+    8318:8331:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2110:2123 -> b
+    8332:8332:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10490,"2":10491,"3":10492}}
+    10490:10490:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2123:2123 -> b
+    10491:10491:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2123:2123 -> b
+    10492:10492:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2123:2123 -> b
+    8333:8333:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":10493,"2":10494,"3":10495,"4":10496}}
+    10493:10493:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2124:2124 -> b
+    10494:10494:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2124:2124 -> b
+    10495:10495:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2124:2124 -> b
+    10496:10496:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2124:2124 -> b
+    10457:10457:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2124:2124 -> b
+    10497:10497:java.util.Set lambda$verifyKeptItemsAreKept$13(com.android.tools.r8.graph.DexType):2066:2066 -> b
+    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1798:1798 -> c
+    1:1:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):2003 -> c
+    2:2:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):2004:2004 -> c
     3:3:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> c
-    3:3:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1916 -> c
+    3:3:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):2004 -> c
     4:4:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> c
-    4:4:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1916 -> c
+    4:4:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):2004 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:6:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):1916:1917 -> c
-    7:7:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1919:1919 -> c
+    5:6:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.graph.AppView):2004:2005 -> c
+    7:7:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2007:2007 -> c
     8:8:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> c
-    8:8:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1919 -> c
+    8:8:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2007 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:9:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> c
-    9:9:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1919 -> c
-    10:11:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1944:1945 -> c
-    12:12:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramType(com.android.tools.r8.graph.DexType):706:706 -> c
-    12:12:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1945 -> c
+    9:9:boolean lambda$verifyKeptMethodsAreTargetedAndLive$8(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2007 -> c
+    10:11:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2032:2033 -> c
+    12:12:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramType(com.android.tools.r8.graph.DexType):689:689 -> c
+    12:12:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2033 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramType(com.android.tools.r8.graph.DexType):707:707 -> c
-    13:13:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1945 -> c
-    14:14:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1945:1945 -> c
+    13:13:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramType(com.android.tools.r8.graph.DexType):690:690 -> c
+    13:13:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2033 -> c
+    14:14:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2033:2033 -> c
     15:15:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1963,"2":1964,"3":1965}}
-    1963:1963:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1945:1945 -> c
-    1964:1964:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1945:1945 -> c
-    1965:1965:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1945:1945 -> c
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2051,"2":2052,"3":2053}}
+    2051:2051:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2033:2033 -> c
+    2052:2052:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2033:2033 -> c
+    2053:2053:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2033:2033 -> c
     16:16:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):0:0 -> c
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1966,"2":1967,"3":1968,"4":1969}}
-    1966:1966:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1946:1946 -> c
-    1967:1967:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1946:1946 -> c
-    1968:1968:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1946:1946 -> c
-    1969:1969:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1946:1946 -> c
-    1962:1962:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1946:1946 -> c
-    1970:1970:java.util.Set lambda$verifyKeptItemsAreKept$14(com.android.tools.r8.graph.DexType):1984:1984 -> c
-    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1701:1701 -> d
-    1:1:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1938 -> d
-    2:2:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1939:1939 -> d
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2054,"2":2055,"3":2056,"4":2057}}
+    2054:2054:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2034:2034 -> c
+    2055:2055:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2034:2034 -> c
+    2056:2056:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2034:2034 -> c
+    2057:2057:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2034:2034 -> c
+    2050:2050:void lambda$verifyKeptTypesAreLive$11(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2034:2034 -> c
+    2058:2058:java.util.Set lambda$verifyKeptItemsAreKept$14(com.android.tools.r8.graph.DexType):2072:2072 -> c
+    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1798:1798 -> d
+    1:1:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):2026 -> d
+    2:2:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):2027:2027 -> d
     3:3:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> d
-    3:3:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1939 -> d
+    3:3:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):2027 -> d
     4:4:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> d
-    4:4:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1939 -> d
+    4:4:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):2027 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    5:6:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):1939:1940 -> d
-    7:7:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1942:1942 -> d
+    5:6:boolean verifyKeptTypesAreLive(com.android.tools.r8.graph.AppView):2027:2028 -> d
+    7:7:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2030:2030 -> d
     8:8:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> d
-    8:8:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1942 -> d
+    8:8:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2030 -> d
     9:9:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> d
-    9:9:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1942 -> d
+    9:9:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2030 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:10:boolean com.android.tools.r8.shaking.KeepInfo$Joiner.isShrinkingAllowed():543:543 -> d
-    10:10:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):1942 -> d
+    10:10:boolean lambda$verifyKeptTypesAreLive$10(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.KeepInfo$Joiner):2030 -> d
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2054,"2":2055,"3":2056}}
-    2054:2054:java.lang.String toString():2044:2044 -> toString
-    2055:2055:java.lang.String toString():2044:2044 -> toString
-    2056:2056:java.lang.String toString():2045:2045 -> toString
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2140,"2":2141,"3":2142}}
+    2140:2140:java.lang.String toString():2132:2132 -> toString
+    2141:2141:java.lang.String toString():2132:2132 -> toString
+    2142:2142:java.lang.String toString():2133:2133 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2057,"2":2058,"3":2059}}
-    2057:2057:java.lang.String toString():2046:2046 -> toString
-    2058:2058:java.lang.String toString():2046:2046 -> toString
-    2059:2059:java.lang.String toString():2046:2046 -> toString
-    2048:2053:java.lang.String toString():2046:2051 -> toString
-com.android.tools.r8.shaking.RootSetUtils$RootSetBase -> com.android.tools.r8.shaking.N2:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2143,"2":2144,"3":2145}}
+    2143:2143:java.lang.String toString():2134:2134 -> toString
+    2144:2144:java.lang.String toString():2134:2134 -> toString
+    2145:2145:java.lang.String toString():2134:2134 -> toString
+    2136:2139:java.lang.String toString():2134:2137 -> toString
+com.android.tools.r8.shaking.RootSetUtils$RootSetBase -> com.android.tools.r8.shaking.Q2:
     java.util.Map dependentKeepClassCompatRule -> d
     java.util.List delayedRootSetActionItems -> e
     com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection dependentMinimumKeepInfo -> c
     java.util.Set neverInlineDueToSingleCaller -> a
     java.util.Set neverClassInline -> b
     com.android.tools.r8.utils.collections.ProgramMethodMap pendingMethodMoveInverse -> f
-    1:7:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1683:1689 -> <init>
-    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1697:1697 -> a
-com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder -> com.android.tools.r8.shaking.Q2:
-    java.util.Set identifierNameStrings -> w
-    java.util.Map dependentKeepClassCompatRule -> s
+    1:7:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection,java.util.Map,java.util.List,com.android.tools.r8.utils.collections.ProgramMethodMap):1780:1786 -> <init>
+    1:1:com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection getDependentMinimumKeepInfo():1794:1794 -> a
+com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder -> com.android.tools.r8.shaking.T2:
     com.android.tools.r8.graph.AppView appView -> a
-    java.util.Map noSideEffects -> u
-    java.util.Set alwaysInline -> g
-    com.android.tools.r8.utils.PredicateSet alwaysClassInline -> m
-    java.util.Set bypassClinitforInlining -> i
-    java.util.Queue delayedRootSetActionItems -> y
-    java.util.Set classesWithCheckDiscardedMembers -> D
-    java.util.Set noUnusedInterfaceRemoval -> o
-    com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> b
-    com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection dependentMinimumKeepInfo -> e
-    java.util.Set noHorizontalClassMerging -> q
-    java.util.Set reprocess -> k
-    com.android.tools.r8.shaking.DexStringCache dexStringCache -> A
-    java.util.Map mayHaveSideEffects -> t
-    java.lang.Iterable rules -> d
-    java.util.LinkedHashMap reasonAsked -> f
-    java.util.Set ifRules -> B
-    java.util.Map assumedValues -> v
-    com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper interfaceDesugaringSyntheticHelper -> F
-    java.util.Map keptMethodBridges -> x
-    java.util.Set neverInlineDueToSingleCaller -> h
-    java.util.Map assumeNoSideEffectsWarnings -> C
-    java.util.Set whyAreYouNotInlining -> j
-    com.android.tools.r8.utils.collections.ProgramMethodMap pendingMethodMoveInverse -> G
-    com.android.tools.r8.graph.DirectMappedDexApplication application -> c
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> E
-    java.util.Set noVerticalClassMerging -> p
-    java.util.Set neverPropagateValue -> r
-    boolean $assertionsDisabled -> H
-    java.util.Set neverReprocess -> l
-    com.android.tools.r8.utils.InternalOptions options -> z
-    java.util.Set neverClassInline -> n
-    1:1:void <clinit>():105:105 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RootSetUtils$1):105:105 -> <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):105:105 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):154:154 -> <init>
-    4:56:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):111:163 -> <init>
-    57:57:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):168:168 -> <init>
+    java.util.Set neverPropagateValue -> s
+    java.lang.Iterable rules -> e
+    java.util.Set ifRules -> A
+    java.util.LinkedHashMap reasonAsked -> g
+    java.util.Map mayHaveSideEffects -> u
+    com.android.tools.r8.utils.collections.ProgramMethodMap pendingMethodMoveInverse -> F
+    java.util.Map keptMethodBridges -> w
+    java.util.Map assumeNoSideEffectsWarnings -> B
+    com.android.tools.r8.ir.desugar.itf.InterfaceDesugaringSyntheticHelper interfaceDesugaringSyntheticHelper -> E
+    java.util.Set neverInlineDueToSingleCaller -> i
+    com.android.tools.r8.graph.DirectMappedDexApplication application -> d
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> D
+    java.util.Set neverClassInline -> o
+    java.util.Set noVerticalClassMerging -> q
+    boolean $assertionsDisabled -> G
+    java.util.Set whyAreYouNotInlining -> k
+    com.android.tools.r8.utils.InternalOptions options -> y
+    java.util.Set neverReprocess -> m
+    java.util.Map dependentKeepClassCompatRule -> t
+    com.android.tools.r8.shaking.DexStringCache dexStringCache -> z
+    java.util.Set identifierNameStrings -> v
+    java.util.Set alwaysInline -> h
+    java.util.Set bypassClinitforInlining -> j
+    java.util.Queue delayedRootSetActionItems -> x
+    java.util.Set classesWithCheckDiscardedMembers -> C
+    com.android.tools.r8.utils.PredicateSet alwaysClassInline -> n
+    com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection dependentMinimumKeepInfo -> f
+    java.util.Set noUnusedInterfaceRemoval -> p
+    com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> c
+    com.android.tools.r8.shaking.AssumeInfoCollection$Builder assumeInfoCollectionBuilder -> b
+    java.util.Set noHorizontalClassMerging -> r
+    java.util.Set reprocess -> l
+    1:1:void <clinit>():109:109 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RootSetUtils$1):109:109 -> <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):109:109 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):157:157 -> <init>
+    4:54:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):116:166 -> <init>
+    55:55:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):171:171 -> <init>
     void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult) -> a
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$15(com.android.tools.r8.graph.DexReference) -> 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):105:105 -> a
-    2:2:com.android.tools.r8.graph.DexProgramClass access$600(com.android.tools.r8.graph.DexDefinition,java.util.Map):105:105 -> a
-    3:3:void access$700(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):105:105 -> a
-    4:19:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):302:317 -> a
-    20:20:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):316:316 -> a
-    21:26:void lambda$runPerRule$2(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):320:325 -> a
-    27:84:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):332:389 -> a
-    85:86:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):348:349 -> a
-    87:87:void lambda$build$3(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):357:357 -> a
-    88:99:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):394:405 -> a
-    100:134:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):415:449 -> a
-    135:140:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet buildConsequentRootSet():454:459 -> a
-    141:143:boolean lambda$markMatchingVisibleMethods$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):504:506 -> a
-    144:145: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.DexClassAndMethod):510:511 -> a
-    146:146:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):661:661 -> a
-    146:146:boolean access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):105 -> a
+    1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):109:109 -> a
+    2:2:com.android.tools.r8.graph.DexProgramClass access$600(com.android.tools.r8.graph.DexDefinition,java.util.Map):109:109 -> a
+    3:3:void access$700(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):109:109 -> a
+    4:4:com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder setAssumeInfoCollectionBuilder(com.android.tools.r8.shaking.AssumeInfoCollection$Builder):184:184 -> a
+    5:20:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):319:334 -> a
+    21:21:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):333:333 -> a
+    22:27:void lambda$runPerRule$2(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):337:342 -> a
+    28:83:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):349:404 -> a
+    84:85:com.android.tools.r8.shaking.RootSetUtils$RootSet build(java.util.concurrent.ExecutorService):365:366 -> a
+    86:86:void lambda$build$3(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):374:374 -> a
+    87:97:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):409:419 -> a
+    98:132:void propagateAssumeRules(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.Set):425:459 -> a
+    98:132:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):419 -> a
+    133:138:com.android.tools.r8.shaking.RootSetUtils$ConsequentRootSet buildConsequentRootSet():464:469 -> a
+    139:141:boolean lambda$markMatchingVisibleMethods$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):514:516 -> a
+    142:143: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.DexClassAndMethod):520:521 -> a
+    144:144:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):671:671 -> a
+    144:144:boolean access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):109 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    147:148:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):661:662 -> a
-    147:148:boolean access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):105 -> a
-    149:150:boolean com.android.tools.r8.utils.ArrayUtils.contains(java.lang.Object[],java.lang.Object):129:130 -> a
-    149:150:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):662 -> a
-    149:150:boolean access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):105 -> a
-    151:152:void lambda$markMatchingMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):711:712 -> a
-    153:162: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):724:733 -> a
-    163:163: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):743:743 -> a
-    164:165:void lambda$markMatchingFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndField):746:747 -> a
-    166:228:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):754:816 -> a
-    229:230:void lambda$writeSeeds$10(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexType):759:760 -> a
-    231:232:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):768:769 -> a
-    233:233:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1780,"2":1781,"3":1782}}
-    1780:1780:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):770:770 -> a
-    1781:1781:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):770:770 -> a
-    1782:1782:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):770:770 -> a
-    1003:1003:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):770:770 -> a
-    1004:1004:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1784,"2":1785,"3":1786}}
-    1784:1784:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):772:772 -> a
-    1785:1785:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):772:772 -> a
-    1786:1786:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):772:772 -> a
-    1776:1778:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):772:774 -> a
-    1779:1779:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):769:769 -> a
-    1787:1790:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):782:785 -> a
-    1791:1791:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
-    1791:1791:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):785 -> a
-    1792:1806:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):785:799 -> a
-    1807:1807:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2625,"2":2626,"3":2627}}
-    2625:2625:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):800:800 -> a
-    2626:2626:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):800:800 -> a
-    2627:2627:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):800:800 -> a
-    2607:2609:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):800:802 -> a
-    2610:2624:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):799:813 -> a
-    2628:2628:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):820:820 -> a
-    2628:2628:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):181 -> a
-    2629:2630:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):824:825 -> a
-    2629:2630:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):184 -> a
-    2631:2631:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):829:829 -> a
-    2631:2631:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):187 -> a
-    2632:2632:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):979:979 -> a
-    2632:2632:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):829 -> a
-    2632:2632:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):187 -> a
-    2633:2633:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):978:978 -> a
-    2633:2633:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):829 -> a
-    2633:2633:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):187 -> a
-    2634:2688:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):191:245 -> a
-    2689:2689:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):933:933 -> a
-    2689:2689:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):221 -> a
-    2690:2691:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):946:947 -> a
-    2690:2691:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):934 -> a
-    2690:2691:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):221 -> a
-    2692:2693:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1092:1093 -> a
-    2692:2693:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226 -> a
-    2694:2694:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2694:2694:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1093 -> a
-    2694:2694:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226 -> a
-    2695:2695:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1095:1095 -> a
-    2695:2695:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):226 -> a
-    2696:2702:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):227:233 -> a
-    2703:2712:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):232:241 -> a
-    2713:2750:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):214:251 -> a
-    2751:2751:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
-    2751:2751:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):253 -> a
-    2752:2752:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254:254 -> a
-    2753:2754:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1373:1374 -> a
-    2753:2754:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
-    2755:2760:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1384:1389 -> a
-    2755:2760:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1374 -> a
-    2755:2760:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
-    2761:2763:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1376:1378 -> a
-    2761:2763:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
-    2764:2764:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
-    2764:2764:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1378 -> a
+    145:146:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):671:672 -> a
+    145:146:boolean access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):109 -> a
+    147:148:boolean com.android.tools.r8.utils.ArrayUtils.contains(java.lang.Object[],java.lang.Object):129:130 -> a
+    147:148:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):672 -> a
+    147:148:boolean access$300(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):109 -> a
+    149:150:void lambda$markMatchingMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):720:721 -> a
+    151:160: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):733:742 -> a
+    161:161: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):752:752 -> a
+    162:163:void lambda$markMatchingFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndField):755:756 -> a
+    164:226:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):763:825 -> a
+    227:228:void lambda$writeSeeds$10(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexType):768:769 -> a
+    229:230:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):777:778 -> a
+    231:231:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1796,"2":1797,"3":1798}}
+    1796:1796:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):779:779 -> a
+    1797:1797:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):779:779 -> a
+    1798:1798:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):779:779 -> a
+    1010:1010:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):779:779 -> a
+    1011:1011:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":1800,"2":1801,"3":1802}}
+    1800:1800:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):781:781 -> a
+    1801:1801:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):781:781 -> a
+    1802:1802:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):781:781 -> a
+    1792:1794:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):781:783 -> a
+    1795:1795:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):778:778 -> a
+    1803:1806:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):791:794 -> a
+    1807:1807:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):113:113 -> a
+    1807:1807:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):794 -> a
+    1808:1822:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):794:808 -> a
+    1823:1823:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":2650,"2":2651,"3":2652}}
+    2650:2650:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):809:809 -> a
+    2651:2651:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):809:809 -> a
+    2652:2652:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):809:809 -> a
+    2632:2634:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):809:811 -> a
+    2635:2649:void lambda$writeSeeds$12(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):808:822 -> a
+    2653:2653:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):829:829 -> a
+    2653:2653:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):190 -> a
+    2654:2655:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):833:834 -> a
+    2654:2655:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):193 -> a
+    2656:2656:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):838:838 -> a
+    2656:2656:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):196 -> a
+    2657:2657:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):988:988 -> a
+    2657:2657:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):838 -> a
+    2657:2657:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):196 -> a
+    2658:2658:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):987:987 -> a
+    2658:2658:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):838 -> a
+    2658:2658:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):196 -> a
+    2659:2713:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):200:254 -> a
+    2714:2714:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):942:942 -> a
+    2714:2714:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):230 -> a
+    2715:2716:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):955:956 -> a
+    2715:2716:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):943 -> a
+    2715:2716:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):230 -> a
+    2717:2718:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1101:1102 -> a
+    2717:2718:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):235 -> a
+    2719:2719:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2719:2719:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1102 -> a
+    2719:2719:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):235 -> a
+    2720:2720:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1104:1104 -> a
+    2720:2720:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):235 -> a
+    2721:2727:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):236:242 -> a
+    2728:2737:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):241:250 -> a
+    2738:2775:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):223:260 -> a
+    2776:2776:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
+    2776:2776:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):262 -> a
+    2777:2777:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):263:263 -> a
+    2778:2779:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1374:1375 -> a
+    2778:2779:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):263 -> a
+    2780:2785:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1385:1390 -> a
+    2780:2785:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1375 -> a
+    2780:2785:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):263 -> a
+    2786:2788:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1377:1379 -> a
+    2786:2788:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):263 -> a
+    2789:2789:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
+    2789:2789:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1379 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2764:2764:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
-    2765:2765:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
-    2765:2765:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1378 -> a
-    2765:2765:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
-    2766:2766:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1378:1378 -> a
-    2766:2766:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):254 -> a
-    2767:2767:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):255:255 -> a
-    2768:2769:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1092:1093 -> a
-    2768:2769:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):256 -> a
-    2770:2770:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2770:2770:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1093 -> a
-    2770:2770:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):256 -> a
-    2771:2771:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1095:1095 -> a
-    2771:2771:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):256 -> a
-    2772:2808:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):257:293 -> a
-    2809:2809:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):933:933 -> a
-    2809:2809:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):284 -> a
-    2810:2811:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):946:947 -> a
-    2810:2811:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):934 -> a
-    2810:2811:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):284 -> a
-    2812:2813:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1092:1093 -> a
-    2812:2813:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):285 -> a
-    2814:2814:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2814:2814:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1093 -> a
-    2814:2814:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):285 -> a
-    2815:2815:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1095:1095 -> a
-    2815:2815:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):285 -> a
-    2816:2816:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):278:278 -> a
-    2817:2819:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):262:264 -> a
-    2820:2822:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):263:265 -> a
-    2823:2823:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):252:252 -> a
-    2824:2835:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):887:898 -> a
-    2836:2836:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):979:979 -> a
-    2836:2836:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):898 -> a
-    2837:2837:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):978:978 -> a
-    2837:2837:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):898 -> a
-    2838:2854:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):900:916 -> a
-    2855:2860:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):923:928 -> a
-    2861:2861:boolean lambda$anySourceMatchesInheritanceRuleDirectly$13(boolean,com.android.tools.r8.graph.DexType):927:927 -> a
-    2862:2864:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):962:964 -> a
-    2865:2865:boolean sideEffectFreeIsRuleSatisfiedByField(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClassAndField):973:973 -> a
-    2866:2867:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):991:992 -> a
-    2868:2878:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):988:998 -> a
-    2879:2879:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():78:78 -> a
-    2879:2879:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):999 -> a
+    2789:2789:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):263 -> a
+    2790:2790:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
+    2790:2790:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1379 -> a
+    2790:2790:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):263 -> a
+    2791:2791:void evaluateCheckDiscardRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1379:1379 -> a
+    2791:2791:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):263 -> a
+    2792:2793:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):264:265 -> a
+    2794:2796:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1483:1485 -> a
+    2794:2796:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
+    2797:2797:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    2797:2797:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1486 -> a
+    2797:2797:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
+    2798:2798:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    2798:2798:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1486 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2880:2880:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():78:78 -> a
-    2880:2880:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):999 -> a
-    2881:2881:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):999:999 -> a
-    2882:2882:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():78:78 -> a
-    2882:2882:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):74 -> a
-    2882:2882:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1004 -> a
-    2883:2883:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):74:74 -> a
-    2883:2883:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1004 -> a
-    2884:2884:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1004:1004 -> a
-    2885:2891:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1001:1007 -> a
-    2892:2896:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1020:1024 -> a
-    2897:2898:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):1041:1042 -> a
-    2897:2898:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1026 -> a
-    2899:2902:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1030:1033 -> a
-    2903:2908:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1031:1036 -> a
-    2909:2917:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1057:1065 -> a
-    2918:2918:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2918:2918:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1064 -> a
-    2919:2921:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1068:1070 -> a
-    2922:2925:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1081:1084 -> a
-    2926:2926:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2926:2926:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1084 -> a
-    2927:2927:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1086:1086 -> a
-    2928:2945:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1100:1117 -> a
-    2946:2946:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():702:702 -> a
-    2946:2946:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1118 -> a
-    2947:2947:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
-    2947:2947:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1118 -> a
+    2798:2798:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
+    2799:2810:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1487:1498 -> a
+    2799:2810:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
+    2811:2811:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
+    2811:2811:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1498 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2948:2948:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
-    2948:2948:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1118 -> a
-    2949:2949:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:561 -> a
-    2949:2949:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1119 -> a
+    2811:2811:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
+    2812:2812:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
+    2812:2812:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1498 -> a
+    2812:2812:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
+    2813:2823:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1498:1508 -> a
+    2813:2823:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
+    2824:2824:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
+    2824:2824:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1508 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2950:2951:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:562 -> a
-    2950:2951:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1119 -> a
-    2952:2956:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1120:1124 -> a
-    2957:2957:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():670:670 -> a
-    2957:2957:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1124 -> a
+    2824:2824:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
+    2825:2825:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
+    2825:2825:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1508 -> a
+    2825:2825:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
+    2826:2826:void evaluateCheckEnumUnboxedRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.CheckEnumUnboxedRule):1508:1508 -> a
+    2826:2826:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):265 -> a
+    2827:2827:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):266:266 -> a
+    2828:2829:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1101:1102 -> a
+    2828:2829:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):267 -> a
+    2830:2830:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2830:2830:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1102 -> a
+    2830:2830:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):267 -> a
+    2831:2831:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1104:1104 -> a
+    2831:2831:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):267 -> a
+    2832:2874:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):268:310 -> a
+    2875:2875:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):942:942 -> a
+    2875:2875:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):299 -> a
+    2876:2877:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):955:956 -> a
+    2876:2877:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):943 -> a
+    2876:2877:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):299 -> a
+    2878:2879:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1101:1102 -> a
+    2878:2879:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):300 -> a
+    2880:2880:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2880:2880:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1102 -> a
+    2880:2880:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):300 -> a
+    2881:2881:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1104:1104 -> a
+    2881:2881:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):300 -> a
+    2882:2882:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):293:293 -> a
+    2883:2886:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):276:279 -> a
+    2887:2887:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):261:261 -> a
+    2888:2899:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):896:907 -> a
+    2900:2900:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):988:988 -> a
+    2900:2900:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):907 -> a
+    2901:2901:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):987:987 -> a
+    2901:2901:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):907 -> a
+    2902:2918:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):909:925 -> a
+    2919:2924:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):932:937 -> a
+    2925:2925:boolean lambda$anySourceMatchesInheritanceRuleDirectly$13(boolean,com.android.tools.r8.graph.DexType):936:936 -> a
+    2926:2928:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):971:973 -> a
+    2929:2929:boolean sideEffectFreeIsRuleSatisfiedByField(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClassAndField):982:982 -> a
+    2930:2931:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1000:1001 -> a
+    2932:2942:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):997:1007 -> a
+    2943:2943:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():78:78 -> a
+    2943:2943:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1008 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2958:2959:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1124:1125 -> a
-    2960:2960:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():702:702 -> a
-    2960:2960:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1126 -> a
-    2961:2961:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
-    2961:2961:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1126 -> a
+    2944:2944:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():78:78 -> a
+    2944:2944:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1008 -> a
+    2945:2945:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1008:1008 -> a
+    2946:2946:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotations():78:78 -> a
+    2946:2946:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):74 -> a
+    2946:2946:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1013 -> a
+    2947:2947:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexClassAndMethod.getParameterAnnotation(int):74:74 -> a
+    2947:2947:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1013 -> a
+    2948:2948:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1013:1013 -> a
+    2949:2955:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClassAndMember,java.util.function.Consumer):1010:1016 -> a
+    2956:2960:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1029:1033 -> a
+    2961:2962:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):1050:1051 -> a
+    2961:2962:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1035 -> a
+    2963:2966:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1039:1042 -> a
+    2967:2972:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.Definition,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexAnnotation$AnnotatedKind):1040:1045 -> a
+    2973:2981:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1066:1074 -> a
+    2982:2982:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2982:2982:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1073 -> a
+    2983:2985:void markMethod(com.android.tools.r8.graph.DexClassAndMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1077:1079 -> a
+    2986:2989:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1090:1093 -> a
+    2990:2990:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2990:2990:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1093 -> a
+    2991:2991:void markField(com.android.tools.r8.graph.DexClassAndField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1095:1095 -> a
+    2992:3009:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1109:1126 -> a
+    3010:3010:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():716:716 -> a
+    3010:3010:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1127 -> a
+    3011:3011:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
+    3011:3011:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1127 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    2962:2962:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
-    2962:2962:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1126 -> a
-    2963:2963:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1127:1127 -> a
-    2964:2964:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1153:1153 -> a
-    2965:2965:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
-    2965:2965:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1153 -> a
-    2966:2971:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1154:1159 -> a
-    2972:2983:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1158:1169 -> a
-    2984:3003:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1168:1187 -> a
-    3004:3004:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
-    3004:3004:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1189 -> a
-    3005:3007:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1190:1192 -> a
-    3008:3009:void evaluateCheckDiscardMemberRule(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1402:1403 -> a
-    3008:3009:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1191 -> a
-    3010:3033:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1193:1216 -> a
-    3034:3034:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1213:1213 -> a
-    3035:3038:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1207:1210 -> a
-    3039:3042:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1201:1204 -> a
-    3043:3070:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1198:1225 -> a
-    3071:3071:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1222:1222 -> a
-    3072:3072:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isClassInlineRule():0:0 -> a
-    3072:3072:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1226 -> a
-    3073:3091:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1227:1245 -> a
-    3092:3100:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1239:1247 -> a
-    3101:3101:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1230:1230 -> a
-    3102:3102:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4520,"2":4521,"3":4522}}
-    4520:4520:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1230:1230 -> a
-    4521:4521:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1230:1230 -> a
-    4522:4522:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1230:1230 -> a
-    4334:4401:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1232:1299 -> a
-    4402:4402:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
-    4402:4402:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1299 -> a
-    4403:4408:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1300:1305 -> a
-    4409:4409:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
-    4409:4409:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
-    4410:4418:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1306:1314 -> a
-    4419:4419:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1591:1591 -> a
-    4419:4419:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1315 -> a
-    4420:4420:boolean isMainDexRootSetBuilder():0:0 -> a
-    4420:4420:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1591 -> a
-    4420:4420:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1315 -> a
-    4421:4433:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1591:1603 -> a
-    4421:4433:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1315 -> a
-    4434:4434:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
-    4434:4434:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1603 -> a
+    3012:3012:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
+    3012:3012:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1127 -> a
+    3013:3013:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:561 -> a
+    3013:3013:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1128 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4434:4434:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1315 -> a
-    4435:4435:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
-    4435:4435:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1603 -> a
-    4435:4435:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1315 -> a
-    4436:4436:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1604:1604 -> a
-    4436:4436:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1315 -> a
-    4437:4437:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4523,"2":4524,"3":4525}}
-    4523:4523:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1604:1604 -> a
-    4523:4523:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1315 -> a
-    4524:4524:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1604:1604 -> a
-    4524:4524:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1315 -> a
-    4525:4525:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1604:1604 -> a
-    4525:4525:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1315 -> a
-    4438:4441:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1607:1610 -> a
-    4438:4441:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1315 -> a
-    4442:4453:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1604:1615 -> a
-    4442:4453:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1315 -> a
-    4454:4465:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1316:1327 -> a
-    4466:4474:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1321:1329 -> a
-    4475:4475:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isReprocessMethodRule():0:0 -> a
-    4475:4475:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1331 -> a
-    4476:4486:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1332:1342 -> a
-    4487:4519:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1336:1368 -> a
-    4526:4528:void evaluateCheckDiscardClassAndAllMembersRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1395:1397 -> a
-    4529:4529:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1407:1407 -> a
-    4530:4530:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    4530:4530:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1408 -> a
-    4531:4531:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
-    4531:4531:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1408 -> a
+    3014:3015:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:562 -> a
+    3014:3015:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1128 -> a
+    3016:3020:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1129:1133 -> a
+    3021:3021:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():675:675 -> a
+    3021:3021:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1133 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4532:4533:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1409:1410 -> a
-    4534:4534:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1423:1423 -> a
-    4535:4535:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
-    4535:4535:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1423 -> a
+    3022:3023:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1133:1134 -> a
+    3024:3024:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():716:716 -> a
+    3024:3024:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1135 -> a
+    3025:3025:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
+    3025:3025:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1135 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4536:4536:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1423:1423 -> a
-    4537:4537:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1422:1422 -> a
-    4538:4538:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1421:1421 -> a
-    4539:4540:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1436:1437 -> a
-    4541:4541:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
-    4541:4541:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1438 -> a
+    3026:3026:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
+    3026:3026:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1135 -> a
+    3027:3027:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1136:1136 -> a
+    3028:3028:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1162:1162 -> a
+    3029:3029:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
+    3029:3029:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1162 -> a
+    3030:3035:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1163:1168 -> a
+    3036:3047:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1167:1178 -> a
+    3048:3048:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardCheckDiscardRule():0:0 -> a
+    3048:3048:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1179 -> a
+    3049:3051:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1180:1182 -> a
+    3052:3053:void evaluateCheckDiscardMemberRule(com.android.tools.r8.graph.ProgramMember,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1403:1404 -> a
+    3052:3053:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1181 -> a
+    3054:3077:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1183:1206 -> a
+    3078:3078:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1203:1203 -> a
+    3079:3082:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1197:1200 -> a
+    3083:3086:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1191:1194 -> a
+    3087:3114:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1188:1215 -> a
+    3115:3115:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1212:1212 -> a
+    3116:3116:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isClassInlineRule():0:0 -> a
+    3116:3116:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1216 -> a
+    3117:3135:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1217:1235 -> a
+    3136:3144:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1229:1237 -> a
+    3145:3145:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1220:1220 -> a
+    3146:3146:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4565,"2":4566,"3":4567}}
+    4565:4565:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1220:1220 -> a
+    4566:4566:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1220:1220 -> a
+    4567:4567:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1220:1220 -> a
+    4368:4435:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1222:1289 -> a
+    4436:4436:boolean com.android.tools.r8.graph.Definition.isProgramField():0:0 -> a
+    4436:4436:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1289 -> a
+    4437:4442:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1290:1295 -> a
+    4443:4443:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
+    4443:4443:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1295 -> a
+    4444:4452:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1296:1304 -> a
+    4453:4453:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1672:1672 -> a
+    4453:4453:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
+    4454:4454:boolean isMainDexRootSetBuilder():0:0 -> a
+    4454:4454:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1672 -> a
+    4454:4454:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
+    4455:4467:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1672:1684 -> a
+    4455:4467:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
+    4468:4468:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
+    4468:4468:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1684 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4542:4542:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
-    4542:4542:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1438 -> a
-    4543:4560:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1438:1455 -> a
-    4561:4561:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):295:295 -> a
-    4561:4561:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1455 -> a
+    4468:4468:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
+    4469:4469:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
+    4469:4469:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1684 -> a
+    4469:4469:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
+    4470:4470:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1685:1685 -> a
+    4470:4470:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
+    4471:4471:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":4568,"2":4569,"3":4570}}
+    4568:4568:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1685:1685 -> a
+    4568:4568:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
+    4569:4569:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1685:1685 -> a
+    4569:4569:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
+    4570:4570:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1685:1685 -> a
+    4570:4570:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
+    4472:4475:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1688:1691 -> a
+    4472:4475:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
+    4476:4487:void evaluateIdentifierNameStringRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1685:1696 -> a
+    4476:4487:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1305 -> a
+    4488:4499:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1306:1317 -> a
+    4500:4508:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1311:1319 -> a
+    4509:4509:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isReprocessMethodRule():0:0 -> a
+    4509:4509:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1321 -> a
+    4510:4520:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1322:1332 -> a
+    4521:4564:void addItemToSets(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1326:1369 -> a
+    4571:4573:void evaluateCheckDiscardClassAndAllMembersRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardCheckDiscardRule):1396:1398 -> a
+    4574:4574:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1408:1408 -> a
+    4575:4575:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    4575:4575:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1409 -> a
+    4576:4576:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateUnconditionalMinimumKeepInfo():74:74 -> a
+    4576:4576:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1409 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4562:4562:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):295:295 -> a
-    4562:4562:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1455 -> a
-    4563:4563:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1465:1465 -> a
-    4564:4564:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():88:88 -> a
-    4564:4564:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1466 -> a
+    4577:4578:void setCheckDiscarded(com.android.tools.r8.graph.ProgramDefinition):1410:1411 -> a
+    4579:4579:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1424:1424 -> a
+    4580:4580:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClassAndMember.getReference():11:11 -> a
+    4580:4580:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1424 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4565:4565:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():88:88 -> a
-    4565:4565:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1466 -> a
-    4566:4584:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1472:1490 -> a
-    4585:4588:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1489:1492 -> a
-    4589:4593:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1619:1623 -> a
-    4589:4593:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1495 -> a
-    4594:4612:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1496:1514 -> a
-    4613:4613:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():675:675 -> a
-    4613:4613:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1514 -> a
+    4581:4581:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1424:1424 -> a
+    4582:4582:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1423:1423 -> a
+    4583:4583:com.android.tools.r8.utils.TraversalContinuation lambda$finalizeCheckDiscardedInformation$16(com.android.tools.r8.shaking.MinimumKeepInfoCollection,com.android.tools.r8.graph.ProgramMember):1422:1422 -> a
+    4584:4597:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1433:1446 -> a
+    4598:4615:void evaluateAssumeNoSideEffectsRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.ProguardMemberRule):1445:1462 -> a
+    4616:4620:void lambda$evaluateAssumeNoSideEffectsRule$17(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule,com.android.tools.r8.shaking.AssumeInfoCollection$Builder):1448:1452 -> a
+    4621:4633:void evaluateAssumeValuesRule(com.android.tools.r8.graph.Definition,com.android.tools.r8.shaking.ProguardAssumeValuesRule,com.android.tools.r8.shaking.ProguardMemberRule):1467:1479 -> a
+    4634:4635:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1517:1518 -> a
+    4636:4636:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
+    4636:4636:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1519 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4614:4616:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1514:1516 -> a
-    4617:4617:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
-    4617:4617:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1516 -> a
+    4637:4637:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo com.android.tools.r8.graph.DexClassAndField.getOptimizationInfo():41:41 -> a
+    4637:4637:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1519 -> a
+    4638:4655:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1519:1536 -> a
+    4656:4656:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):295:295 -> a
+    4656:4656:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1536 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4618:4618:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
-    4618:4618:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1516 -> a
-    4619:4624:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1517:1522 -> a
-    4625:4625:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
-    4625:4625:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1522 -> a
+    4657:4657:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):295:295 -> a
+    4657:4657:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1536 -> a
+    4658:4658:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1546:1546 -> a
+    4659:4659:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():88:88 -> a
+    4659:4659:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1547 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4626:4626:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
-    4626:4626:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1522 -> a
-    4627:4627:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:561 -> a
-    4627:4627:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1523 -> a
+    4660:4660:boolean com.android.tools.r8.shaking.ProguardKeepRuleModifiers.isBottom():88:88 -> a
+    4660:4660:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1547 -> a
+    4661:4679:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1553:1571 -> a
+    4680:4683:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1570:1573 -> a
+    4684:4688:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1700:1704 -> a
+    4684:4688:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1576 -> a
+    4689:4707:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1577:1595 -> a
+    4708:4708:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():680:680 -> a
+    4708:4708:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1595 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4628:4629:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:562 -> a
-    4628:4629:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1523 -> a
-    4630:4639:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1524:1533 -> a
-    4640:4640:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():747:747 -> a
-    4640:4640:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1533 -> a
+    4709:4711:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1595:1597 -> a
+    4712:4712:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
+    4712:4712:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1597 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4641:4641:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():748:748 -> a
-    4641:4641:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1533 -> a
-    4642:4644:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1533:1535 -> a
-    4645:4645:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
-    4645:4645:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1535 -> a
+    4713:4713:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
+    4713:4713:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1597 -> a
+    4714:4719:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1598:1603 -> a
+    4720:4720:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
+    4720:4720:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1603 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4646:4646:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
-    4646:4646:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1535 -> a
-    4647:4651:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1536:1540 -> a
-    4652:4652:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():685:685 -> a
-    4652:4652:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():660 -> a
-    4652:4652:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1540 -> a
+    4721:4721:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
+    4721:4721:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1603 -> a
+    4722:4722:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:561 -> a
+    4722:4722:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1604 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4723:4724:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:562 -> a
+    4723:4724:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1604 -> a
+    4725:4734:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1605:1614 -> a
+    4735:4735:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():752:752 -> a
+    4735:4735:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1614 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4736:4736:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():753:753 -> a
+    4736:4736:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1614 -> a
+    4737:4739:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1614:1616 -> a
+    4740:4740:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
+    4740:4740:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1616 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    4741:4741:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
+    4741:4741:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1616 -> a
+    4742:4746:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1617:1621 -> a
+    4747:4747:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():690:690 -> a
+    4747:4747:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():665 -> a
+    4747:4747:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1621 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4653:4655:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1540:1542 -> a
-    4656:4656:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
-    4656:4656:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1542 -> a
+    4748:4750:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1621:1623 -> a
+    4751:4751:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
+    4751:4751:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1623 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4657:4657:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
-    4657:4657:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1542 -> a
-    4658:4664:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1543:1549 -> a
-    4665:4665:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
-    4665:4665:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1549 -> a
+    4752:4752:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
+    4752:4752:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1623 -> a
+    4753:4759:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1624:1630 -> a
+    4760:4760:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
+    4760:4760:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1630 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4666:4666:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
-    4666:4666:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1549 -> a
-    4667:4671:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1550:1554 -> a
-    4672:4672:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():670:670 -> a
-    4672:4672:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1554 -> a
+    4761:4761:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
+    4761:4761:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1630 -> a
+    4762:4766:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1631:1635 -> a
+    4767:4767:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():675:675 -> a
+    4767:4767:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1635 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4673:4675:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1554:1556 -> a
-    4676:4676:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
-    4676:4676:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1556 -> a
+    4768:4770:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1635:1637 -> a
+    4771:4771:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
+    4771:4771:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1637 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4677:4677:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
-    4677:4677:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1556 -> a
-    4678:4682:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1557:1561 -> a
-    4683:4683:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():675:675 -> a
-    4683:4683:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1561 -> a
+    4772:4772:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
+    4772:4772:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1637 -> a
+    4773:4777:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1638:1642 -> a
+    4778:4778:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():680:680 -> a
+    4778:4778:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1642 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4684:4686:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1561:1563 -> a
-    4687:4687:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
-    4687:4687:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1563 -> a
+    4779:4781:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1642:1644 -> a
+    4782:4782:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
+    4782:4782:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1644 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4688:4688:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
-    4688:4688:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1563 -> a
-    4689:4693:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1564:1568 -> a
-    4694:4694:boolean isMainDexRootSetBuilder():0:0 -> a
-    4694:4694:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1568 -> a
-    4695:4699:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1568:1572 -> a
-    4700:4700:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
-    4700:4700:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1572 -> a
+    4783:4783:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
+    4783:4783:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1644 -> a
+    4784:4788:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1645:1649 -> a
+    4789:4789:boolean isMainDexRootSetBuilder():0:0 -> a
+    4789:4789:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1649 -> a
+    4790:4794:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1649:1653 -> a
+    4795:4795:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):69:69 -> a
+    4795:4795:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1653 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4701:4701:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
-    4701:4701:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1572 -> a
-    4702:4702:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:561 -> a
-    4702:4702:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1573 -> a
+    4796:4796:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getOrCreateMinimumKeepInfoFor(com.android.tools.r8.shaking.EnqueuerEvent,com.android.tools.r8.graph.DexReference):70:70 -> a
+    4796:4796:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1653 -> a
+    4797:4797:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:561 -> a
+    4797:4797:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1654 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4703:4704:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:562 -> a
-    4703:4704:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1573 -> a
-    4705:4713:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1574:1582 -> a
-    4714:4724:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1133:1143 -> a
-    4714:4724:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1583 -> a
-    4725:4725:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1584:1584 -> a
-    4726:4726:java.util.Set lambda$evaluateKeepRule$17(com.android.tools.r8.graph.DexType):1478:1478 -> a
-    4727:4731:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1628:1632 -> a
-    4732:4732:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$18(com.android.tools.r8.utils.OriginWithPosition):1631:1631 -> a
-    4733:4733:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1636:1636 -> a
-    4734:4746:void lambda$generateAssumeNoSideEffectsWarnings$19(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1651:1663 -> a
-    4747:4747:void lambda$generateAssumeNoSideEffectsWarnings$19(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1658:1658 -> a
+    4798:4799:com.android.tools.r8.shaking.KeepInfo$Joiner com.android.tools.r8.shaking.KeepInfo$Joiner.addRule(com.android.tools.r8.shaking.ProguardKeepRuleBase):561:562 -> a
+    4798:4799:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1654 -> a
+    4800:4808:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1655:1663 -> a
+    4809:4819:void includeDescriptorClasses(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1142:1152 -> a
+    4809:4819:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1664 -> a
+    4820:4820:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1665:1665 -> a
+    4821:4821:java.util.Set lambda$evaluateKeepRule$18(com.android.tools.r8.graph.DexType):1559:1559 -> a
+    4822:4826:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1709:1713 -> a
+    4827:4827:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$19(com.android.tools.r8.utils.OriginWithPosition):1712:1712 -> a
+    4828:4828:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1717:1717 -> a
+    4829:4841:void lambda$generateAssumeNoSideEffectsWarnings$20(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1732:1744 -> a
+    4842:4842:void lambda$generateAssumeNoSideEffectsWarnings$20(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1739:1739 -> a
+    4843:4852:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1750:1759 -> a
+    4853:4853:void reportAssumeValuesWarningForMissingReturnField(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.ir.analysis.value.AbstractValue):1754:1754 -> a
     void lambda$sideEffectFreeIsRuleSatisfiedByField$14(com.android.tools.r8.shaking.AnnotationMatchResult) -> b
-    1:1:java.util.Map access$400(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):105:105 -> b
-    2:2:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):233:233 -> b
-    3:12:com.android.tools.r8.graph.DexProgramClass testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):472:481 -> b
-    13:43: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):493:523 -> b
+    1:1:java.util.Map access$400(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):109:109 -> b
+    2:2:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):242:242 -> b
+    3:12:com.android.tools.r8.graph.DexProgramClass testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):482:491 -> b
+    13:43: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):503:533 -> b
     44:44:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> b
-    44:44: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):523 -> b
-    45:45: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):524:524 -> b
+    44:44: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):533 -> b
+    45:45: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):534:534 -> b
     46:46:boolean isMainDexRootSetBuilder():0:0 -> b
-    46:46: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):525 -> b
-    47:49: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):526:528 -> b
-    50:51:void lambda$markMatchingOverriddenMethods$6(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):695:696 -> b
-    52:52: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):708:708 -> b
-    53:54:void lambda$markMatchingVisibleFields$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndField):730:731 -> b
-    55:55:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):829:829 -> b
-    56:56:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):979:979 -> b
-    56:56:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):829 -> b
-    57:57:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):978:978 -> b
-    57:57:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):829 -> b
-    58:60:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):951:953 -> b
-    61:63:void finalizeCheckDiscardedInformation():1414:1416 -> b
+    46:46: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):535 -> b
+    47:49: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):536:538 -> b
+    50:51:void lambda$markMatchingOverriddenMethods$6(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndMethod):704:705 -> b
+    52:52: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):717:717 -> b
+    53:54:void lambda$markMatchingVisibleFields$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClassAndField):739:740 -> b
+    55:55:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):838:838 -> b
+    56:56:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):988:988 -> b
+    56:56:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):838 -> b
+    57:57:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):987:987 -> b
+    57:57:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):838 -> b
+    58:60:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):960:962 -> b
+    61:63:void finalizeCheckDiscardedInformation():1415:1417 -> b
     64:64:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
-    64:64:void finalizeCheckDiscardedInformation():1415 -> b
+    64:64:void finalizeCheckDiscardedInformation():1416 -> b
     65:65:com.android.tools.r8.shaking.MinimumKeepInfoCollection com.android.tools.r8.shaking.DependentMinimumKeepInfoCollection.getUnconditionalMinimumKeepInfoOrDefault(com.android.tools.r8.shaking.MinimumKeepInfoCollection):88:88 -> b
-    65:65:void finalizeCheckDiscardedInformation():1415 -> b
+    65:65:void finalizeCheckDiscardedInformation():1416 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    66:67:void finalizeCheckDiscardedInformation():1417:1418 -> b
-    68:68:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):358:358 -> b
-    68:68:void finalizeCheckDiscardedInformation():1419 -> b
+    66:67:void finalizeCheckDiscardedInformation():1418:1419 -> b
+    68:68:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):362:362 -> b
+    68:68:void finalizeCheckDiscardedInformation():1420 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     69:69:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():155:155 -> b
-    69:69:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):359 -> b
-    69:69:void finalizeCheckDiscardedInformation():1419 -> b
-    70:72:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):360:362 -> b
-    70:72:void finalizeCheckDiscardedInformation():1419 -> b
+    69:69:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):363 -> b
+    69:69:void finalizeCheckDiscardedInformation():1420 -> b
+    70:72:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):364:366 -> b
+    70:72:void finalizeCheckDiscardedInformation():1420 -> b
     73:73:boolean com.android.tools.r8.utils.TraversalContinuation.shouldContinue():155:155 -> b
-    73:73:void finalizeCheckDiscardedInformation():1424 -> b
+    73:73:void finalizeCheckDiscardedInformation():1425 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    74:74:void finalizeCheckDiscardedInformation():1425:1425 -> b
-    1:1:java.util.Queue access$500(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):105:105 -> c
-    2:27: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):673:698 -> c
-    28:28:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):841:841 -> c
-    28:28:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):833 -> c
-    29:39:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):851:861 -> c
-    29:39:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):841 -> c
-    29:39:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):833 -> c
-    40:40:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):979:979 -> c
-    40:40:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):861 -> c
-    40:40:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):841 -> c
-    40:40:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):833 -> c
-    41:41:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):978:978 -> c
-    41:41:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):861 -> c
-    41:41:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):841 -> c
-    41:41:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):833 -> c
-    42:46:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):863:867 -> c
-    42:46:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):841 -> c
-    42:46:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):833 -> c
-    47:47:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):846:846 -> c
-    47:47:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):833 -> c
-    48:53:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):873:878 -> c
-    48:53:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):837 -> c
-    54:60:void generateAssumeNoSideEffectsWarnings():1642:1648 -> c
-    1:1:com.android.tools.r8.shaking.DexStringCache access$800(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):105:105 -> d
-com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$1 -> com.android.tools.r8.shaking.O2:
-    1:1:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):1500:1500 -> <init>
+    74:74:void finalizeCheckDiscardedInformation():1426:1426 -> b
+    1:1:java.util.Queue access$500(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):109:109 -> c
+    2:27:void markMatchingOverriddenMethods(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):682:707 -> c
+    28:28:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):850:850 -> c
+    28:28:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):842 -> c
+    29:39:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):860:870 -> c
+    29:39:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):850 -> c
+    29:39:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):842 -> c
+    40:40:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):988:988 -> c
+    40:40:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):870 -> c
+    40:40:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):850 -> c
+    40:40:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):842 -> c
+    41:41:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):987:987 -> c
+    41:41:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):870 -> c
+    41:41:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):850 -> c
+    41:41:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):842 -> c
+    42:46:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):872:876 -> c
+    42:46:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):850 -> c
+    42:46:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):842 -> c
+    47:47:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855:855 -> c
+    47:47:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):842 -> c
+    48:53:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):882:887 -> c
+    48:53:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):846 -> c
+    54:60:void generateAssumeNoSideEffectsWarnings():1723:1729 -> c
+    1:1:com.android.tools.r8.shaking.DexStringCache access$800(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):109:109 -> d
+com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$1 -> com.android.tools.r8.shaking.R2:
+    1:1:void <init>(com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):1581:1581 -> <init>
     void acceptCompanionMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
     void acceptCompanionClassClinit(com.android.tools.r8.graph.ProgramMethod) -> b
-com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.P2:
+com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.S2:
     com.android.tools.r8.shaking.ProguardConfigurationRule context -> c
     java.util.Set seenTypes -> g
     java.util.Map preconditionSupplier -> d
@@ -122136,28 +123226,28 @@
     java.util.Set seenMethods -> f
     com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder this$0 -> h
     com.android.tools.r8.shaking.ProguardIfRule ifRule -> e
-    1:1:void <clinit>():537:537 -> <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):537:537 -> <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):552:552 -> <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):544:559 -> <init>
+    1:1:void <clinit>():547:547 -> <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):547:547 -> <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):562:562 -> <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):554:569 -> <init>
     void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult) -> a
-    1:1:void run():567:567 -> a
-    2:18:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):571:587 -> a
-    19:25:void lambda$visitAllSuperInterfaces$0(com.android.tools.r8.graph.DexClassAndMethod):592:598 -> a
-    26:46:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardMemberRule):605:625 -> a
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    1:1:void run():577:577 -> a
+    2:18:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):581:597 -> a
+    19:25:void lambda$visitAllSuperInterfaces$0(com.android.tools.r8.graph.DexClassAndMethod):602:608 -> a
+    26:46:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardMemberRule):615:635 -> a
+    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     47:47: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):326 -> a
-    47:47:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardMemberRule):625 -> a
+    47:47:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardMemberRule):635 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     48:48: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):326:326 -> a
-    48:48:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardMemberRule):625 -> a
-    49:63:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardMemberRule):626:640 -> a
-    64:68:com.android.tools.r8.graph.ProgramMethod lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):630:634 -> a
-    69:69:void lambda$tryAndKeepMethodOnClass$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):645:645 -> a
+    48:48:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardMemberRule):635 -> a
+    49:63:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.shaking.ProguardMemberRule):636:650 -> a
+    64:68:com.android.tools.r8.graph.ProgramMethod lambda$tryAndKeepMethodOnClass$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):640:644 -> a
+    69:69:void lambda$tryAndKeepMethodOnClass$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):655:655 -> a
     70:70:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    70:70:void lambda$tryAndKeepMethodOnClass$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):646 -> a
-    71:72:void lambda$tryAndKeepMethodOnClass$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):654:655 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.mW:
+    70:70:void lambda$tryAndKeepMethodOnClass$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):656 -> a
+    71:72:void lambda$tryAndKeepMethodOnClass$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetUtils$RootSetBuilder):664:665 -> a
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.HW:
     java.util.Set exceptionGuardTypes -> c
     java.util.Set instanceOfTypes -> a
     java.util.Set checkCastTypes -> b
@@ -122169,7 +123259,7 @@
     3:3:boolean com.android.tools.r8.shaking.RuntimeTypeCheckInfo.isExceptionGuardType(com.android.tools.r8.graph.DexProgramClass):102:102 -> a
     3:3:boolean isRuntimeCheckType(com.android.tools.r8.graph.DexProgramClass):106 -> a
     4:7:com.android.tools.r8.shaking.RuntimeTypeCheckInfo rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):110:113 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.lW:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.GW:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.Set instanceOfTypes -> c
     java.util.Set checkCastTypes -> d
@@ -122188,7 +123278,7 @@
     1:1:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):70:70 -> c
     2:4:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.add(com.android.tools.r8.graph.DexType,java.util.Set):79:81 -> c
     2:4:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):70 -> c
-com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.R2:
+com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.U2:
     java.util.Map items -> b
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet parent -> a
@@ -122207,7 +123297,7 @@
     21:21:com.android.tools.r8.shaking.ScopedDexMethodSet getParent():75:75 -> a
     22:22:void setParent(com.android.tools.r8.shaking.ScopedDexMethodSet):79:79 -> a
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet newNestedScope():36:36 -> b
-com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.BX:
+com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.WX:
     java.util.Map cache -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -122220,7 +123310,7 @@
     17:17:void lambda$removeInstantiatedType$3(com.android.tools.r8.ir.desugar.LambdaDescriptor):47:47 -> a
     18:23:com.android.tools.r8.graph.DexEncodedMethod getCachedItem(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):52:57 -> a
     1:5:boolean hasCachedItem(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):61:65 -> b
-com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.I10:
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.e20:
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Set prunedTypes -> d
     java.util.Set methodsToKeepForConfigurationDebugging -> e
@@ -122234,96 +123324,96 @@
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.shaking.TreePruner):44:44 -> a
     2:2:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):64:64 -> a
     3:11:com.android.tools.r8.graph.DirectMappedDexApplication run(java.util.concurrent.ExecutorService):70:78 -> a
-    12:16:void com.android.tools.r8.shaking.TreePruner.fixupOptimizationInfo(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService):395:399 -> a
+    12:16:void com.android.tools.r8.shaking.TreePruner.fixupOptimizationInfo(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService):398:402 -> a
     12:16:com.android.tools.r8.graph.DirectMappedDexApplication run(java.util.concurrent.ExecutorService):79 -> a
-    17:34:void com.android.tools.r8.shaking.TreePruner.fixupOptimizationInfo(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService):398:415 -> a
+    17:34:void com.android.tools.r8.shaking.TreePruner.fixupOptimizationInfo(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.concurrent.ExecutorService):401:418 -> a
     17:34:com.android.tools.r8.graph.DirectMappedDexApplication run(java.util.concurrent.ExecutorService):79 -> a
     35:36:com.android.tools.r8.graph.DirectMappedDexApplication run(java.util.concurrent.ExecutorService):82:83 -> a
     37:38:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):88:89 -> a
     39:50:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.Collection):93:104 -> a
     39:50:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):89 -> a
-    51:51:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> a
+    51:51:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> a
     51:51:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.Collection):108 -> a
     51:51:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):89 -> a
     52:54:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.Collection):114:116 -> a
     52:54:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):89 -> a
-    55:66:void com.android.tools.r8.shaking.TreePruner.pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):135:146 -> a
+    55:66:void com.android.tools.r8.shaking.TreePruner.pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):138:149 -> a
     55:66:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.Collection):119 -> a
     55:66:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):89 -> a
-    67:77:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.Collection):120:130 -> a
-    67:77:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):89 -> a
-    78:78:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):89:89 -> a
-    79:90:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):152:163 -> a
-    91:92:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):181:182 -> a
-    93:98:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):57:62 -> a
-    93:98:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):289 -> a
-    93:98:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):182 -> a
-    99:99:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):289:289 -> a
-    99:99:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):182 -> a
-    100:103:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):184:187 -> a
-    104:109:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):57:62 -> a
-    104:109:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):289 -> a
-    104:109:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):187 -> a
-    110:110:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):289:289 -> a
-    110:110:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):187 -> a
-    111:125:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):189:203 -> a
-    126:129:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):419:422 -> a
-    126:129:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):203 -> a
-    130:130:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":132,"2":133,"3":134}}
-    132:132:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):422:422 -> a
-    132:132:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):203 -> a
-    133:133:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):422:422 -> a
-    133:133:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):203 -> a
-    134:134:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):422:422 -> a
-    134:134:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):203 -> a
-    131:131:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):423:423 -> a
-    131:131:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):203 -> a
-    135:142:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Function):208:215 -> a
-    143:159:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.function.Function):242:258 -> a
-    143:159:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Function):216 -> a
-    160:160:boolean isTypeLive(com.android.tools.r8.graph.DexType):226:226 -> a
-    161:162:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.function.Function):233:234 -> a
-    163:164:boolean lambda$clearDeadNestMembers$1(java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.NestMemberClassAttribute):236:237 -> a
-    165:167:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):264:266 -> a
-    168:168:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):270:270 -> a
-    169:169:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):222:222 -> a
-    169:169:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):270 -> a
-    170:173:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):270:273 -> a
-    174:188:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.InnerClassAttribute.getLiveContext(com.android.tools.r8.graph.AppView):101:115 -> a
-    174:188:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):273 -> a
-    189:189:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):222:222 -> a
-    189:189:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):274 -> a
-    190:190:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):274:274 -> a
-    191:193:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):294:296 -> a
-    194:195:int com.android.tools.r8.shaking.TreePruner.firstUnreachableIndex(java.util.List,java.util.function.Predicate):279:280 -> a
-    194:195:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):297 -> a
-    196:197:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):300:301 -> a
-    198:199:void com.android.tools.r8.shaking.TreePruner.canonicalizeCode(com.android.tools.r8.graph.ProgramMethod):345:346 -> a
-    198:199:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):301 -> a
-    200:204:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):305:309 -> a
-    205:206:void com.android.tools.r8.shaking.TreePruner.canonicalizeCode(com.android.tools.r8.graph.ProgramMethod):345:346 -> a
-    205:206:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):309 -> a
-    207:213:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):310:316 -> a
-    214:242:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):313:341 -> a
-    243:243:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):297:297 -> a
-    244:245:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):351:352 -> a
-    246:247:int com.android.tools.r8.shaking.TreePruner.firstUnreachableIndex(java.util.List,java.util.function.Predicate):279:280 -> a
-    246:247:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):354 -> a
-    248:269:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):359:380 -> a
-    270:270:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):353:353 -> a
-    271:271:java.util.Collection getMethodsToKeepForConfigurationDebugging():388:388 -> a
+    67:80:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.Collection):120:133 -> a
+    67:80:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):89 -> a
+    81:81:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):89:89 -> a
+    82:93:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):155:166 -> a
+    94:95:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):184:185 -> a
+    96:101:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):57:62 -> a
+    96:101:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):292 -> a
+    96:101:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):185 -> a
+    102:102:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):292:292 -> a
+    102:102:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):185 -> a
+    103:106:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):187:190 -> a
+    107:112:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):57:62 -> a
+    107:112:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):292 -> a
+    107:112:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
+    113:113:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):292:292 -> a
+    113:113:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
+    114:128:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):192:206 -> a
+    129:132:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):422:425 -> a
+    129:132:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):206 -> a
+    133:133:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":135,"2":136,"3":137}}
+    135:135:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):425:425 -> a
+    135:135:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):206 -> a
+    136:136:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):425:425 -> a
+    136:136:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):206 -> a
+    137:137:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):425:425 -> a
+    137:137:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):206 -> a
+    134:134:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):426:426 -> a
+    134:134:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):206 -> a
+    138:145:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Function):211:218 -> a
+    146:162:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.function.Function):245:261 -> a
+    146:162:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate,java.util.function.Function):219 -> a
+    163:163:boolean isTypeLive(com.android.tools.r8.graph.DexType):229:229 -> a
+    164:165:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass,java.util.function.Predicate,java.util.function.Function):236:237 -> a
+    166:167:boolean lambda$clearDeadNestMembers$1(java.util.function.Function,java.util.function.Predicate,com.android.tools.r8.graph.NestMemberClassAttribute):239:240 -> a
+    168:170:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):267:269 -> a
+    171:171:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):273:273 -> a
+    172:172:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):225:225 -> a
+    172:172:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):273 -> a
+    173:176:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):273:276 -> a
+    177:191:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.InnerClassAttribute.getLiveContext(com.android.tools.r8.graph.AppView):101:115 -> a
+    177:191:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):276 -> a
+    192:192:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):225:225 -> a
+    192:192:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):277 -> a
+    193:193:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):277:277 -> a
+    194:196:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):297:299 -> a
+    197:198:int com.android.tools.r8.shaking.TreePruner.firstUnreachableIndex(java.util.List,java.util.function.Predicate):282:283 -> a
+    197:198:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):300 -> a
+    199:200:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):303:304 -> a
+    201:202:void com.android.tools.r8.shaking.TreePruner.canonicalizeCode(com.android.tools.r8.graph.ProgramMethod):348:349 -> a
+    201:202:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):304 -> a
+    203:207:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):308:312 -> a
+    208:209:void com.android.tools.r8.shaking.TreePruner.canonicalizeCode(com.android.tools.r8.graph.ProgramMethod):348:349 -> a
+    208:209:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):312 -> a
+    210:216:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):313:319 -> a
+    217:245:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexProgramClass):316:344 -> a
+    246:246:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):300:300 -> a
+    247:248:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):354:355 -> a
+    249:250:int com.android.tools.r8.shaking.TreePruner.firstUnreachableIndex(java.util.List,java.util.function.Predicate):282:283 -> a
+    249:250:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):357 -> a
+    251:272:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):362:383 -> a
+    273:273:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):356:356 -> a
+    274:274:java.util.Collection getMethodsToKeepForConfigurationDebugging():391:391 -> a
     1:1:java.util.Set access$100(com.android.tools.r8.shaking.TreePruner):44:44 -> b
-    2:9:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):168:175 -> b
-    10:10:java.util.Set getRemovedClasses():384:384 -> b
-com.android.tools.r8.shaking.TreePruner$1 -> com.android.tools.r8.internal.H10:
+    2:9:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):171:178 -> b
+    10:10:java.util.Set getRemovedClasses():387:387 -> b
+com.android.tools.r8.shaking.TreePruner$1 -> com.android.tools.r8.internal.d20:
     com.android.tools.r8.shaking.TreePruner this$0 -> a
-    1:1:void <init>(com.android.tools.r8.shaking.TreePruner):401:401 -> <init>
-    1:1:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):404:404 -> a
-    2:2:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):410:410 -> a
-com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.J10:
+    1:1:void <init>(com.android.tools.r8.shaking.TreePruner):404:404 -> <init>
+    1:1:void fixup(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):407:407 -> a
+    2:2:void fixup(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MutableMethodOptimizationInfo):413:413 -> a
+com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.f20:
     boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.P30:
+com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.l40:
     com.android.tools.r8.shaking.UnusedItemsPrinter DONT_PRINT -> e
     com.android.tools.r8.shaking.UnusedItemsPrinter$Members currentMembers -> c
     java.util.List classes -> d
@@ -122402,7 +123492,7 @@
     6:9:void visited():61:64 -> b
     10:10:void registerUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> b
     11:11:void registerUnusedField(com.android.tools.r8.graph.DexEncodedField):72:72 -> b
-com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.N30:
+com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.j40:
     java.util.List methods -> b
     java.util.List fields -> a
     1:3:void <init>():18:20 -> <init>
@@ -122410,7 +123500,7 @@
     1:1:int lambda$sort$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):27:27 -> a
     2:3:void sort():27:28 -> a
     4:4:int lambda$sort$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
-com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.internal.O30:
+com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.internal.k40:
     1:1:void <init>():139:139 -> <init>
     void finished() -> a
     void registerUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
@@ -122418,7 +123508,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.C40:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.internal.Y40:
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> r
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> b
     java.util.List synthesizedBridges -> q
@@ -122456,17 +123546,17 @@
     54:54:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInSameBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticItems):204 -> a
     54:54:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):392 -> a
     55:58:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):395:398 -> a
-    59:59:boolean com.android.tools.r8.graph.DexClass.isAnnotation():674:674 -> a
+    59:59:boolean com.android.tools.r8.graph.DexClass.isAnnotation():688:688 -> a
     59:59:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):402 -> a
     60:60:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):405:405 -> a
-    61:61:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854:854 -> a
+    61:61:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868:868 -> a
     61:61:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406 -> a
     62:62:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
-    62:62:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854 -> a
+    62:62:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     62:62:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406 -> a
     63:63:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
-    63:63:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):854 -> a
+    63:63:boolean com.android.tools.r8.graph.DexClass.isSerializable(com.android.tools.r8.graph.AppView):868 -> a
     63:63:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406 -> a
     64:64:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):406:406 -> a
     65:65:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):455:455 -> a
@@ -122494,16 +123584,16 @@
     101:101:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.utils.TraversalContinuation.breakIf(boolean):120:120 -> a
     101:101:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$2(com.android.tools.r8.graph.ProgramMethod):463 -> a
     102:127:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):476:501 -> a
-    128:129:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1239:1240 -> a
+    128:129:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1265:1266 -> a
     128:129:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):502 -> a
     130:130:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():442:442 -> a
-    130:130:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1240 -> a
+    130:130:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1266 -> a
     130:130:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):502 -> a
     131:132:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):503:504 -> a
-    133:134:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1239:1240 -> a
+    133:134:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1265:1266 -> a
     133:134:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505 -> a
     135:135:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():442:442 -> a
-    135:135:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1240 -> a
+    135:135:boolean com.android.tools.r8.graph.DexClass.hasStaticSynchronizedMethods():1266 -> a
     135:135:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505 -> a
     136:151:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):507:522 -> a
     152:170:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):953:971 -> a
@@ -122511,20 +123601,20 @@
     171:171:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):970:970 -> a
     171:171:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):528 -> a
     172:180:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):529:537 -> a
-    181:181:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):60:60 -> a
+    181:181:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):61:61 -> a
     181:181:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):538 -> a
-    182:182:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):59:59 -> a
+    182:182:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):60:60 -> a
     182:182:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):538 -> a
-    183:187:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):68:72 -> a
-    183:187:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):57 -> a
+    183:187:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):69:73 -> a
+    183:187:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):58 -> a
     183:187:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):538 -> a
     188:188:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):539:539 -> a
-    189:189:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):60:60 -> a
+    189:189:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):61:61 -> a
     189:189:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):540 -> a
-    190:190:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):59:59 -> a
+    190:190:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):60:60 -> a
     190:190:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):540 -> a
-    191:195:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):68:72 -> a
-    191:195:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):57 -> a
+    191:195:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getMembersApiReferenceLevelForMerging(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.androidapi.ComputedApiLevel):69:73 -> a
+    191:195:com.android.tools.r8.androidapi.ComputedApiLevel com.android.tools.r8.utils.AndroidApiLevelUtils.getApiReferenceLevelForMerging(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.graph.DexProgramClass):58 -> a
     191:195:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):540 -> a
     196:198:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):541:543 -> a
     199:200:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):515:516 -> a
@@ -122563,10 +123653,10 @@
     1:1:com.android.tools.r8.graph.SubtypingInfo access$100(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> b
     2:20:void initializeMergeCandidates(java.lang.Iterable):277:295 -> b
     21:21:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):552:552 -> b
-    22:22:boolean com.android.tools.r8.graph.DexClass.isPrivate():743:743 -> b
+    22:22:boolean com.android.tools.r8.graph.DexClass.isPrivate():757:757 -> b
     22:22:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):556 -> b
     23:23:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):556:556 -> b
-    24:24:boolean com.android.tools.r8.graph.DexClass.isPrivate():743:743 -> b
+    24:24:boolean com.android.tools.r8.graph.DexClass.isPrivate():757:757 -> b
     24:24:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):557 -> b
     25:37:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):557:569 -> b
     38:38:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():225:225 -> b
@@ -122616,7 +123706,7 @@
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> k
     1:1:java.util.concurrent.ExecutorService access$800(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> l
     1:1:com.android.tools.r8.utils.Timing access$900(com.android.tools.r8.shaking.VerticalClassMerger):120:120 -> m
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.t40:
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.P40:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     boolean com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.$assertionsDisabled -> a
@@ -122667,7 +123757,7 @@
     82:82:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
     83:83:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):149:149 -> a
     83:83:void com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.printLogMessageForClass(com.android.tools.r8.graph.DexClass):144 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.u40:
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.Q40:
     com.android.tools.r8.graph.DexProgramClass target -> b
     java.util.List synthesizedBridges -> d
     com.android.tools.r8.graph.DexProgramClass source -> a
@@ -122762,7 +123852,7 @@
     200:200:boolean restoreDebuggingState(java.util.stream.Stream):1423:1423 -> a
     201:201:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder getRenamings():1429:1429 -> a
     202:230:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1438:1466 -> a
-    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    231:231:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     231:231: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):326 -> a
     231:231:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1466 -> a
     232:232: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):326:326 -> a
@@ -122804,9 +123894,9 @@
     3:4:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1619:1620 -> c
     3:4:boolean merge():1002 -> c
     5:16:boolean merge():1004:1015 -> c
-    17:17:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):282:282 -> c
+    17:17:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):286:286 -> c
     17:17:boolean merge():1015 -> c
-    18:18:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):282:282 -> c
+    18:18:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):286:286 -> c
     18:18:boolean merge():1015 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:19:boolean merge():1052:1052 -> c
@@ -122920,7 +124010,7 @@
     319:319:boolean merge():1266:1266 -> c
     328:329:void lambda$restoreDebuggingState$14(com.android.tools.r8.graph.DexEncodedMethod):1419:1420 -> c
     1:1:boolean lambda$restoreDebuggingState$15(com.android.tools.r8.graph.DexEncodedMethod):1424:1424 -> d
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.v40:
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.R40:
     java.util.Map seenPositions -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> c
     java.util.Collection invokes -> f
@@ -122937,7 +124027,7 @@
     19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1915:1916 -> 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):1935:1966 -> a
     1:22:boolean mayCollide():1882:1903 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.w40:
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.S40:
     com.android.tools.r8.graph.AppView appView -> f
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2117:2118 -> <init>
     1:2:boolean checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):2139:2140 -> a
@@ -123010,7 +124100,7 @@
     3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):398:398 -> i
     3:3:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2123 -> i
     4:11:boolean checkFieldReference(com.android.tools.r8.graph.DexField):2124:2131 -> i
-com.android.tools.r8.shaking.VerticalClassMerger$InvokeSpecialToDefaultLibraryMethodUseRegistry -> com.android.tools.r8.internal.x40:
+com.android.tools.r8.shaking.VerticalClassMerger$InvokeSpecialToDefaultLibraryMethodUseRegistry -> com.android.tools.r8.internal.T40:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():2249:2249 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):2254:2255 -> <init>
@@ -123026,7 +124116,7 @@
     void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> g
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.y40:
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.U40:
     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
@@ -123042,7 +124132,7 @@
     51:58:boolean com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever.typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):688:695 -> a
     51:58:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):676 -> a
     59:59:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):682:682 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.z40:
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.V40:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> h
     com.android.tools.r8.graph.DexProgramClass target -> g
@@ -123062,7 +124152,7 @@
     2:2:com.android.tools.r8.graph.proto.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):2089:2089 -> d
     1:1:com.android.tools.r8.graph.DexMethod getPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):2043:2043 -> e
     boolean isContextFreeForMethods() -> g
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.A40:
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.W40:
     com.android.tools.r8.ir.code.Invoke$Type type -> g
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethod invocationTarget -> f
@@ -123095,7 +124185,7 @@
     8:8:boolean com.android.tools.r8.ir.code.Invoke$Type.isStatic():198:198 -> z0
     8:8:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2349 -> z0
     9:13:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2349:2353 -> z0
-com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.B40:
+com.android.tools.r8.shaking.VerticalClassMerger$VerticalClassMergerTreeFixer -> com.android.tools.r8.internal.X40:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder lensBuilder -> g
     boolean $assertionsDisabled -> j
     com.android.tools.r8.graph.AppView appView -> f
@@ -123122,14 +124212,14 @@
     11:11:void recordMethodChange(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1843 -> a
     12:17:com.android.tools.r8.graph.DexEncodedMethod recordMethodChange(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1850:1855 -> a
     1:3:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1804:1806 -> b
-    4:4:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.graph.TreeFixerBase.fixupFields(java.util.List):161:161 -> b
+    4:4:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.graph.TreeFixerBase.fixupFields(java.util.List):162:162 -> b
     4:4:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1806 -> b
     5:6:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1806:1807 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.graph.TreeFixerBase.fixupFields(java.util.List):161:161 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedField[] com.android.tools.r8.graph.TreeFixerBase.fixupFields(java.util.List):162:162 -> b
     7:7:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1807 -> b
     8:15:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1807:1814 -> b
     16:17:com.android.tools.r8.graph.DexType mapClassType(com.android.tools.r8.graph.DexType):1821:1822 -> b
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.F40:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.b50:
     com.android.tools.r8.graph.AppView appView -> n
     java.util.Map originalMethodSignaturesForBridges -> r
     java.util.Map prototypeChanges -> s
@@ -123155,7 +124245,7 @@
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> f
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):105 -> f
     1:1:boolean isContextFreeForMethods():162:162 -> g
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.D40:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.Z40:
     java.util.Map methodMap -> c
     com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap newMethodSignatures -> f
     boolean $assertionsDisabled -> j
@@ -123219,9 +124309,9 @@
     2:2:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):347:347 -> b
     1:1:void recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):377:377 -> c
     1:3:void recordMerge(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):352:354 -> d
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.E40:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.a50:
     com.android.tools.r8.graph.GraphLens$MethodLookupResult get(com.android.tools.r8.graph.proto.RewrittenPrototypeDescription) -> a
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.g50:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.C50:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -123275,7 +124365,7 @@
     35:39:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230 -> d
     40:46:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230:236 -> d
     47:47: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.e50:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.A50:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -123291,20 +124381,20 @@
     2:3:void com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter.indent():268:269 -> c
     2:3:void startItem(java.lang.String):263 -> c
     4:4:void startItem(java.lang.String):264:264 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.f50:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.B50:
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> a
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> b
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():46:46 -> <clinit>
     1:4:void <init>(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath):50:53 -> <init>
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.shaking.T2:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.shaking.W2:
     int $r8$clinit -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):10:10 -> <init>
-    2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
-    1:1:java.lang.String typeString():79:79 -> C
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.shaking.S2:
-    1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):12:12 -> <init>
-    2:2:void <init>():16:16 -> <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>
+    1:1:java.lang.String typeString():81:81 -> C
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.shaking.V2:
+    1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):14:14 -> <init>
+    2:2:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> e
 com.android.tools.r8.synthesis.CommittedItems -> com.android.tools.r8.synthesis.a:
     com.android.tools.r8.graph.DexApplication application -> a
@@ -123457,7 +124547,7 @@
     2:3:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object[]):52:53 -> c
     2:3:java.util.Set lambda$addGlobalContexts$2(com.android.tools.r8.graph.DexType):108 -> c
     1:1:java.util.List lambda$addMethod$1(com.android.tools.r8.graph.DexType):74:74 -> d
-com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.internal.YV:
+com.android.tools.r8.synthesis.Rewritable -> com.android.tools.r8.internal.tW:
     com.android.tools.r8.graph.DexType getHolder() -> a
     com.android.tools.r8.synthesis.Rewritable rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens) -> a
 com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.synthesis.d:
@@ -123469,21 +124559,21 @@
     1:1:void <clinit>():29:29 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.FeatureSplit):84:88 -> <init>
     1:4:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ClasspathOrLibraryClass):46:49 -> a
-    5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    5:5:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     5:5:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ClasspathOrLibraryClass):49 -> a
     6:6:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ClasspathOrLibraryClass):49:49 -> a
     7:7:com.android.tools.r8.synthesis.SynthesizingContext fromType(com.android.tools.r8.graph.DexType):57:57 -> a
     8:8:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):64:64 -> a
-    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    9:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     9:9:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):65 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    10:10:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     10:10:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):65 -> a
-    11:11:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    11:11:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     11:11:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):65 -> a
     12:12:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.FeatureSplit):65:65 -> a
     13:15:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):74:76 -> a
-    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     16:16:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
     16:16:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):76 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
@@ -123500,10 +124590,10 @@
     30:30:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):116 -> a
     31:33:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):118:120 -> a
     34:34:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128:128 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     35:35:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:36:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():494:494 -> a
+    36:36:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():499:499 -> a
     36:36:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> a
     37:52:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):131:146 -> a
     53:53:boolean isDerivedFromMainDexList(com.android.tools.r8.shaking.MainDexInfo):159:159 -> a
@@ -123550,31 +124640,31 @@
     java.util.List instanceFields -> n
     java.util.List staticFields -> m
     com.android.tools.r8.graph.DexTypeList interfaces -> j
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):59:59 -> <init>
-    2:26:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):40:64 -> <init>
+    1:1:void <clinit>():32:32 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):60:60 -> <init>
+    2:26:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexItemFactory):41:65 -> <init>
     long lambda$build$0(long,com.android.tools.r8.graph.DexProgramClass) -> a
-    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setSuperType(com.android.tools.r8.graph.DexType):109:110 -> a
-    3:3:com.android.tools.r8.synthesis.SyntheticClassBuilder setOriginKind(com.android.tools.r8.ProgramResource$Kind):114:114 -> a
-    4:5:com.android.tools.r8.synthesis.SyntheticClassBuilder setSourceFile(com.android.tools.r8.graph.DexString):119:120 -> a
-    6:7:com.android.tools.r8.synthesis.SyntheticClassBuilder setGenericSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):124:125 -> a
-    8:10:com.android.tools.r8.synthesis.SyntheticClassBuilder setInstanceFields(java.util.List):135:137 -> a
-    11:13:com.android.tools.r8.synthesis.SyntheticClassBuilder setDirectMethods(java.lang.Iterable):141:143 -> a
-    14:16:com.android.tools.r8.synthesis.SyntheticClassBuilder setVirtualMethods(java.lang.Iterable):147:149 -> a
-    17:20:com.android.tools.r8.synthesis.SyntheticClassBuilder addMethod(java.util.function.Consumer):153:156 -> a
-    21:65:com.android.tools.r8.graph.DexClass build():165:209 -> a
-    66:91:com.android.tools.r8.graph.DexClass build():191:216 -> a
+    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setSuperType(com.android.tools.r8.graph.DexType):110:111 -> a
+    3:3:com.android.tools.r8.synthesis.SyntheticClassBuilder setOriginKind(com.android.tools.r8.ProgramResource$Kind):115:115 -> a
+    4:5:com.android.tools.r8.synthesis.SyntheticClassBuilder setSourceFile(com.android.tools.r8.graph.DexString):120:121 -> a
+    6:7:com.android.tools.r8.synthesis.SyntheticClassBuilder setGenericSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):125:126 -> a
+    8:10:com.android.tools.r8.synthesis.SyntheticClassBuilder setInstanceFields(java.util.List):136:138 -> a
+    11:13:com.android.tools.r8.synthesis.SyntheticClassBuilder setDirectMethods(java.lang.Iterable):142:144 -> a
+    14:16:com.android.tools.r8.synthesis.SyntheticClassBuilder setVirtualMethods(java.lang.Iterable):148:150 -> a
+    17:20:com.android.tools.r8.synthesis.SyntheticClassBuilder addMethod(java.util.function.Consumer):154:157 -> a
+    21:67:com.android.tools.r8.graph.DexClass build():166:212 -> a
+    68:94:com.android.tools.r8.graph.DexClass build():193:219 -> a
     com.android.tools.r8.graph.ClassKind getClassKind() -> b
-    1:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setInterfaces(java.util.List):85:88 -> b
-    1:1:com.android.tools.r8.graph.DexItemFactory getFactory():72:72 -> c
-    2:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setStaticFields(java.util.List):129:131 -> c
-    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind():80:80 -> d
-    1:1:com.android.tools.r8.graph.DexType getType():76:76 -> e
+    1:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setInterfaces(java.util.List):86:89 -> b
+    1:1:com.android.tools.r8.graph.DexItemFactory getFactory():73:73 -> c
+    2:4:com.android.tools.r8.synthesis.SyntheticClassBuilder setStaticFields(java.util.List):130:132 -> c
+    1:1:com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind getSyntheticKind():81:81 -> d
+    1:1:com.android.tools.r8.graph.DexType getType():77:77 -> e
     com.android.tools.r8.synthesis.SyntheticClassBuilder self() -> f
-    1:3:com.android.tools.r8.synthesis.SyntheticClassBuilder setAbstract():92:94 -> g
-    1:3:com.android.tools.r8.synthesis.SyntheticClassBuilder setInterface():103:105 -> h
-    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setUseSortedMethodBacking(boolean):160:161 -> i
-    1:1:com.android.tools.r8.synthesis.SyntheticClassBuilder unsetFinal():98:98 -> j
+    1:3:com.android.tools.r8.synthesis.SyntheticClassBuilder setAbstract():93:95 -> g
+    1:3:com.android.tools.r8.synthesis.SyntheticClassBuilder setInterface():104:106 -> h
+    1:2:com.android.tools.r8.synthesis.SyntheticClassBuilder setUseSortedMethodBacking(boolean):161:162 -> i
+    1:1:com.android.tools.r8.synthesis.SyntheticClassBuilder unsetFinal():99:99 -> j
 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>
@@ -123603,10 +124693,10 @@
     com.android.tools.r8.synthesis.SyntheticClasspathDefinition asClasspathDefinition() -> b
     boolean isClasspathDefinition() -> h
     1:1:boolean isValid():43:43 -> j
-    2:2:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> j
+    2:2:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> j
     2:2:boolean isValid():43 -> j
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> j
+    3:3:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> j
     3:3:boolean isValid():43 -> j
     4:4:boolean isValid():43:43 -> j
     1:1:com.android.tools.r8.synthesis.SyntheticClasspathClassReference toReference():38:38 -> k
@@ -123661,7 +124751,7 @@
     24:24:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):18 -> a
     17:17:com.android.tools.r8.synthesis.SyntheticClasspathClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):42:42 -> a
     17:17:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):18 -> a
-com.android.tools.r8.synthesis.SyntheticClasspathDefinition -> com.android.tools.r8.internal.v00:
+com.android.tools.r8.synthesis.SyntheticClasspathDefinition -> com.android.tools.r8.internal.Q00:
 com.android.tools.r8.synthesis.SyntheticDefinition -> com.android.tools.r8.synthesis.k:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind kind -> a
     boolean $assertionsDisabled -> c
@@ -123714,7 +124804,7 @@
     boolean isProgramDefinition() -> i
     boolean isValid() -> j
     com.android.tools.r8.synthesis.SyntheticReference toReference() -> k
-com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.w00:
+com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.R00:
     com.android.tools.r8.graph.ClassResolutionResult 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.utils.InternalOptions options -> a
@@ -123783,7 +124873,7 @@
     815:815:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):468:468 -> a
     816:816:void ensureSourceFile(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString):358:358 -> a
     816:816:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):469 -> a
-    817:817:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):202:202 -> a
+    817:817:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):207:207 -> a
     817:817:void ensureSourceFile(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString):359 -> a
     817:817:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):469 -> a
     818:823:void lambda$buildLensAndProgram$12(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):470:475 -> a
@@ -123801,16 +124891,16 @@
     845:845:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):543:543 -> a
     846:846: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.utils.InternalOptions):113:113 -> a
     846:846:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):543 -> a
-    847:847:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    847:847:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     847:847: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.utils.InternalOptions):113 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     847:847:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):543 -> a
-    848:848:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    848:848:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     848:848: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.utils.InternalOptions):113 -> a
     848:848:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):543 -> a
     849:854: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.utils.InternalOptions):113:118 -> a
     849:854:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):543 -> a
-    855:861: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.DexItemFactory):443:449 -> a
+    855:861: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.DexItemFactory):470:476 -> a
     855:861: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.utils.InternalOptions):118 -> a
     855:861:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):543 -> a
     862:862:com.android.tools.r8.graph.DexAnnotationSet com.android.tools.r8.graph.DexAnnotationSet.getWithAddedOrReplaced(com.android.tools.r8.graph.DexAnnotation):187:187 -> a
@@ -123867,7 +124957,7 @@
     37:37:void lambda$buildLensAndProgram$13(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):480:480 -> b
     38:38:void ensureSourceFile(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString):358:358 -> b
     38:38:void lambda$buildLensAndProgram$13(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):481 -> b
-    39:39:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):202:202 -> b
+    39:39:void com.android.tools.r8.graph.DexClass.setSourceFile(com.android.tools.r8.graph.DexString):207:207 -> b
     39:39:void ensureSourceFile(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexString):359 -> b
     39:39:void lambda$buildLensAndProgram$13(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):481 -> b
     40:42:void lambda$buildLensAndProgram$13(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexString,java.util.function.BiConsumer,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):482:484 -> b
@@ -123947,7 +125037,7 @@
     1820:1820:java.lang.String toString():905:905 -> toString
     1821:1821:java.lang.String toString():905:905 -> toString
     1810:1810:java.lang.String toString():905:905 -> toString
-com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.x00:
+com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.S00:
     com.android.tools.r8.synthesis.CommittedItems commit -> a
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens lens -> b
     com.android.tools.r8.shaking.MainDexInfo mainDexInfo -> d
@@ -123989,10 +125079,10 @@
     23:23:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):269 -> a
     24:31:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):271:278 -> a
     32:34:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):277:279 -> a
-    35:35:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    35:35:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     35:35:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):281 -> a
     36:36:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):281:281 -> a
-    37:37:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    37:37:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     37:37:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):285 -> a
     38:38:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):285:285 -> a
     39:52:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):282:295 -> a
@@ -124176,14 +125266,14 @@
     1319:1319:com.android.tools.r8.synthesis.SynthesizingContext internalGetOuterContext(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView):704:704 -> a
     1319:1319:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):725 -> a
     1320:1320:com.android.tools.r8.graph.DexProgramClass ensureFixedClass(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):726:726 -> a
-    1321:1321:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    1321:1321:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     1321:1321:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):544 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1322:1329:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):545:552 -> a
     1330:1331:java.lang.Object com.android.tools.r8.utils.IterableUtils.min(java.lang.Iterable,java.util.Comparator):101:102 -> a
     1330:1331:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):552 -> a
     1332:1339:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):552:559 -> a
-    1340:1340:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():748:748 -> a
+    1340:1340:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():752:752 -> a
     1340:1340:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156 -> a
     1340:1340:com.android.tools.r8.synthesis.SynthesizingContext getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):559 -> a
     1341:1341:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.synthesis.SyntheticItems):156:156 -> a
@@ -124210,11 +125300,11 @@
     1377:1377:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):798 -> a
     1378:1378:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):771:771 -> a
     1378:1378:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):798 -> a
-    1379:1379:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    1379:1379:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     1379:1379:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):774 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1379:1379:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):798 -> a
-    1380:1380:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    1380:1380:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     1380:1380:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):774 -> a
     1380:1380:com.android.tools.r8.graph.DexClasspathClass internalEnsureFixedClasspathClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):798 -> a
     1381:1382:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):774:775 -> a
@@ -124241,13 +125331,13 @@
     1447:1447:com.android.tools.r8.graph.ClasspathMethod internalEnsureFixedClasspathMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.graph.DexClasspathClass):880 -> a
     1448:1448:void lambda$internalEnsureFixedClasspathMethod$14(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticMethodBuilder):888:888 -> a
     1449:1452:com.android.tools.r8.graph.DexProgramClass ensureGlobalClass(java.util.function.Supplier,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,java.util.Collection,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):928:931 -> a
-    1453:1453:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    1453:1453:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     1453:1453:com.android.tools.r8.graph.DexProgramClass ensureGlobalClass(java.util.function.Supplier,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,java.util.Collection,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):932 -> a
     1454:1460:com.android.tools.r8.graph.DexProgramClass ensureGlobalClass(java.util.function.Supplier,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,java.util.Collection,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):932:938 -> a
     1461:1461:void addGlobalContexts(com.android.tools.r8.graph.DexType,java.util.Collection):1001:1001 -> a
     1461:1461:com.android.tools.r8.graph.DexProgramClass ensureGlobalClass(java.util.function.Supplier,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,java.util.Collection,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):938 -> a
     1462:1464:com.android.tools.r8.graph.DexProgramClass legacyEnsureGlobalClass(java.util.function.Supplier,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):951:953 -> a
-    1465:1465:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    1465:1465:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     1465:1465:com.android.tools.r8.graph.DexProgramClass legacyEnsureGlobalClass(java.util.function.Supplier,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):954 -> a
     1466:1470:com.android.tools.r8.graph.DexProgramClass legacyEnsureGlobalClass(java.util.function.Supplier,com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):954:958 -> a
     1471:1471:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Supplier):977:977 -> a
@@ -124293,10 +125383,10 @@
     1532:1532: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.SyntheticItems$ContextsForGlobalSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,com.android.tools.r8.synthesis.SyntheticItems$State,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy):1057 -> a
     1533:1545: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.SyntheticItems$ContextsForGlobalSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,com.android.tools.r8.synthesis.SyntheticItems$State,com.android.tools.r8.synthesis.SyntheticItems$GlobalSyntheticsStrategy):1057:1069 -> a
     1546:1546:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1076:1076 -> a
-    1547:1547:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    1547:1547:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     1547:1547:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1076 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    1548:1548:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
+    1548:1548:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
     1548:1548:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1076 -> a
     1549:1556:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):1079:1086 -> a
     1557:1557:com.android.tools.r8.synthesis.SyntheticNaming getNaming():205:205 -> a
@@ -124369,12 +125459,12 @@
     60:60:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):771:771 -> b
     60:60:com.android.tools.r8.graph.DexProgramClass internalLookupProgramClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):577 -> b
     60:60:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):598 -> b
-    61:61:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> b
+    61:61:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> b
     61:61:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):774 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     61:61:com.android.tools.r8.graph.DexProgramClass internalLookupProgramClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):577 -> b
     61:61:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):598 -> b
-    62:62:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> b
+    62:62:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> b
     62:62:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):774 -> b
     62:62:com.android.tools.r8.graph.DexProgramClass internalLookupProgramClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):577 -> b
     62:62:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):598 -> b
@@ -124397,12 +125487,12 @@
     70:70:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):771:771 -> b
     70:70:com.android.tools.r8.graph.DexProgramClass internalLookupProgramClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):577 -> b
     70:70:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):591 -> b
-    71:71:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> b
+    71:71:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> b
     71:71:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):774 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     71:71:com.android.tools.r8.graph.DexProgramClass internalLookupProgramClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):577 -> b
     71:71:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):591 -> b
-    72:72:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> b
+    72:72:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> b
     72:72:void errorOnInvalidSyntheticEnsure(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.AppView):774 -> b
     72:72:com.android.tools.r8.graph.DexProgramClass internalLookupProgramClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.AppView):577 -> b
     72:72:com.android.tools.r8.graph.DexProgramClass internalEnsureFixedProgramClass(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,java.util.function.Consumer,java.util.function.Consumer,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.AppView):591 -> b
@@ -124478,7 +125568,7 @@
     5:5:boolean verifyNotRewritten(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):182:182 -> a
     6:12:java.util.Collection getAllProgramClasses():187:193 -> a
     1:1:boolean isEmpty():169:169 -> b
-com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle -> com.android.tools.r8.internal.A00:
+com.android.tools.r8.synthesis.SyntheticItems$SynthesizingContextOracle -> com.android.tools.r8.internal.V00:
     java.util.Set getSynthesizingContexts(com.android.tools.r8.graph.DexProgramClass) -> a
 com.android.tools.r8.synthesis.SyntheticItems$SyntheticKindSelector -> com.android.tools.r8.synthesis.w:
     com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind select(com.android.tools.r8.synthesis.SyntheticNaming) -> a
@@ -124525,7 +125615,7 @@
     59:60:com.android.tools.r8.synthesis.SyntheticMarker internalStripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):168:169 -> a
     59:60:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):134 -> a
     61:63:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):135:137 -> a
-    64:64:boolean com.android.tools.r8.graph.DexAnnotation.hasSynthesizedClassAnnotation(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticItems):456:456 -> a
+    64:64:boolean com.android.tools.r8.graph.DexAnnotation.hasSynthesizedClassAnnotation(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.synthesis.SyntheticItems):483:483 -> a
     64:64:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):136 -> a
     65:65:com.android.tools.r8.synthesis.SyntheticMarker stripMarkerFromClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):135:135 -> a
     66:66:com.android.tools.r8.synthesis.SynthesizingContext getContext():210:210 -> a
@@ -124597,7 +125687,7 @@
     1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setApiLevelForDefinition(com.android.tools.r8.androidapi.ComputedApiLevel):115:115 -> b
     2:2:com.android.tools.r8.synthesis.SyntheticMethodBuilder disableAndroidApiLevelCheck():125:125 -> b
     1:1:com.android.tools.r8.synthesis.SyntheticMethodBuilder setName(java.lang.String):63:63 -> c
-com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.D00:
+com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.Y00:
     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.B:
     boolean $assertionsDisabled -> e
@@ -124853,10 +125943,10 @@
     com.android.tools.r8.synthesis.SyntheticProgramDefinition asProgramDefinition() -> c
     boolean isProgramDefinition() -> i
     1:2:boolean isValid():51:52 -> j
-    3:3:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> j
+    3:3:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> j
     3:3:boolean isValid():53 -> j
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    4:4:boolean com.android.tools.r8.graph.DexClass.isFinal():678:678 -> j
+    4:4:boolean com.android.tools.r8.graph.DexClass.isFinal():692:692 -> j
     4:4:boolean isValid():53 -> j
     5:5:boolean isValid():53:53 -> j
     1:1:com.android.tools.r8.synthesis.SyntheticProgramClassReference toReference():46:46 -> k
@@ -124886,7 +125976,7 @@
     8:8:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):19 -> a
     9:15:com.android.tools.r8.synthesis.SyntheticProgramClassReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):44:50 -> a
     9:15:com.android.tools.r8.synthesis.SyntheticReference internalRewrite(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):19 -> a
-com.android.tools.r8.synthesis.SyntheticProgramDefinition -> com.android.tools.r8.internal.E00:
+com.android.tools.r8.synthesis.SyntheticProgramDefinition -> com.android.tools.r8.internal.Z00:
     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.L:
@@ -125378,7 +126468,7 @@
     12:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.DiagnosticsHandler,java.util.function.Predicate):86:89 -> <init>
     1:1:boolean lambda$new$0(java.util.Set,com.android.tools.r8.graph.DexType):80:80 -> a
     2:11:void run(com.android.tools.r8.tracereferences.TraceReferencesConsumer):93:102 -> a
-    12:12:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):225:225 -> a
+    12:12:void com.android.tools.r8.graph.DexProgramClass.forEachProgramField(java.util.function.Consumer):229:229 -> a
     12:12:void run(com.android.tools.r8.tracereferences.TraceReferencesConsumer):102 -> a
     13:19:void run(com.android.tools.r8.tracereferences.TraceReferencesConsumer):103:109 -> a
     20:20:void lambda$run$1(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramField):102:102 -> a
@@ -125443,10 +126533,10 @@
     45:45:boolean isTargetType(com.android.tools.r8.graph.DexType):147:147 -> a
     45:45:boolean access$500(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexType):114 -> a
     46:47:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):169:170 -> a
-    48:48:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):337:337 -> a
+    48:48:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):349:349 -> a
     48:48:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):171 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    49:49:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):337:337 -> a
+    49:49:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):349:349 -> a
     49:49:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):171 -> a
     50:53:void addClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):172:175 -> a
     54:54:void com.android.tools.r8.tracereferences.internal.TracedClassImpl.<init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):17:17 -> a
@@ -125567,10 +126657,10 @@
     62:75:void lambda$handleRewrittenFieldReference$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult):457:470 -> a
     76:76:void lambda$handleRewrittenFieldReference$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldResolutionResult):468:468 -> a
     77:85:void registerCallSite(com.android.tools.r8.graph.DexCallSite):492:500 -> a
-    86:86:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):337:337 -> a
+    86:86:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):349:349 -> a
     86:86:void registerCallSite(com.android.tools.r8.graph.DexCallSite):500 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    87:87:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):337:337 -> a
+    87:87:com.android.tools.r8.graph.ClassResolutionResult com.android.tools.r8.graph.AppView.contextIndependentDefinitionForWithResolutionResult(com.android.tools.r8.graph.DexType):349:349 -> a
     87:87:void registerCallSite(com.android.tools.r8.graph.DexCallSite):500 -> a
     88:107:void registerCallSite(com.android.tools.r8.graph.DexCallSite):501:520 -> a
     108:116:void lambda$registerCallSite$5(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexClass):505:513 -> a
@@ -125664,15 +126754,15 @@
     1:1:boolean isProtected():29:29 -> isProtected
     1:1:boolean isPublic():24:24 -> isPublic
     1:1:boolean isStatic():19:19 -> isStatic
-com.android.tools.r8.tracereferences.internal.ClassAccessFlagsImpl -> com.android.tools.r8.internal.V9:
+com.android.tools.r8.tracereferences.internal.ClassAccessFlagsImpl -> com.android.tools.r8.internal.Y9:
     1:1:void <init>(com.android.tools.r8.graph.ClassAccessFlags):13:13 -> <init>
     1:1:boolean isEnum():23:23 -> isEnum
     1:1:boolean isInterface():18:18 -> isInterface
-com.android.tools.r8.tracereferences.internal.FieldAccessFlagsImpl -> com.android.tools.r8.internal.hk:
+com.android.tools.r8.tracereferences.internal.FieldAccessFlagsImpl -> com.android.tools.r8.internal.mk:
     1:1:void <init>(com.android.tools.r8.graph.FieldAccessFlags):13:13 -> <init>
-com.android.tools.r8.tracereferences.internal.MethodAccessFlagsImpl -> com.android.tools.r8.internal.eG:
+com.android.tools.r8.tracereferences.internal.MethodAccessFlagsImpl -> com.android.tools.r8.internal.lG:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessFlags):13:13 -> <init>
-com.android.tools.r8.tracereferences.internal.TraceReferencesResult -> com.android.tools.r8.internal.r10:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult -> com.android.tools.r8.internal.N10:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -125682,7 +126772,7 @@
     1:1:java.util.Map getTracedFields():43:43 -> b
     1:1:java.util.Map getTracedMethods():47:47 -> c
     1:1:java.util.Set getTracedPackageNames():51:51 -> d
-com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder -> com.android.tools.r8.internal.q10:
+com.android.tools.r8.tracereferences.internal.TraceReferencesResult$Builder -> com.android.tools.r8.internal.M10:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -125695,7 +126785,7 @@
     1:1:void acceptPackage(com.android.tools.r8.references.PackageReference,com.android.tools.r8.DiagnosticsHandler):83:83 -> acceptPackage
     1:1:void acceptType(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass,com.android.tools.r8.DiagnosticsHandler):66:66 -> acceptType
     1:1:java.util.Set lambda$acceptMethod$1(com.android.tools.r8.references.ClassReference):78:78 -> b
-com.android.tools.r8.tracereferences.internal.TracedClassImpl -> com.android.tools.r8.internal.t10:
+com.android.tools.r8.tracereferences.internal.TracedClassImpl -> com.android.tools.r8.internal.P10:
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.diagnostic.DefinitionContext):17:17 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
     5:5:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.diagnostic.DefinitionContext):21:21 -> <init>
@@ -125703,21 +126793,21 @@
     1:1:java.lang.Object com.android.tools.r8.tracereferences.internal.TracedClassImpl.getReference():14:14 -> toString
     1:1:java.lang.String toString():36 -> toString
     2:2:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedFieldImpl -> com.android.tools.r8.internal.u10:
+com.android.tools.r8.tracereferences.internal.TracedFieldImpl -> com.android.tools.r8.internal.Q10:
     1:3:void <init>(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.diagnostic.DefinitionContext):21:21 -> <init>
     5:5:void <init>(com.android.tools.r8.references.FieldReference,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.tracereferences.TraceReferencesConsumer$FieldAccessFlags):31:31 -> <init>
     1:1:java.lang.Object com.android.tools.r8.tracereferences.internal.TracedFieldImpl.getReference():14:14 -> toString
     1:1:java.lang.String toString():36 -> toString
     2:2:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedMethodImpl -> com.android.tools.r8.internal.v10:
+com.android.tools.r8.tracereferences.internal.TracedMethodImpl -> com.android.tools.r8.internal.R10:
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.diagnostic.DefinitionContext):22:24 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.diagnostic.DefinitionContext):21:21 -> <init>
     5:5:void <init>(com.android.tools.r8.references.MethodReference,com.android.tools.r8.diagnostic.DefinitionContext,com.android.tools.r8.tracereferences.TraceReferencesConsumer$MethodAccessFlags):31:31 -> <init>
     1:1:java.lang.Object com.android.tools.r8.tracereferences.internal.TracedMethodImpl.getReference():14:14 -> toString
     1:1:java.lang.String toString():36 -> toString
     2:2:java.lang.String toString():36:36 -> toString
-com.android.tools.r8.tracereferences.internal.TracedReferenceBase -> com.android.tools.r8.internal.w10:
+com.android.tools.r8.tracereferences.internal.TracedReferenceBase -> com.android.tools.r8.internal.S10:
     com.android.tools.r8.diagnostic.DefinitionContext referencedFrom -> b
     boolean $assertionsDisabled -> e
     java.lang.Object accessFlags -> c
@@ -125866,10 +126956,11 @@
     1:1:void <clinit>():84:84 -> <clinit>
 com.android.tools.r8.utils.AndroidApiLevelUtils -> com.android.tools.r8.internal.e2:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:18:boolean isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):30:47 -> a
-    19:19:boolean isApiSafeForMemberRebinding(com.android.tools.r8.graph.LibraryMethod,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.utils.InternalOptions):85:85 -> a
-    20:26:boolean isApiSafeForMemberRebinding(com.android.tools.r8.graph.LibraryMethod,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.utils.InternalOptions):84:90 -> a
+    1:1:void <clinit>():18:18 -> <clinit>
+    1:18:boolean isApiSafeForInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):31:48 -> a
+    19:19:boolean isApiSafeForMemberRebinding(com.android.tools.r8.graph.LibraryMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.utils.InternalOptions):87:87 -> a
+    20:28:boolean isApiSafeForMemberRebinding(com.android.tools.r8.graph.LibraryMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.utils.InternalOptions):86:94 -> a
+    29:39:boolean isApiSafeForMemberRebinding(com.android.tools.r8.graph.LibraryMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.AndroidApiLevelCompute,com.android.tools.r8.utils.InternalOptions):93:103 -> a
 com.android.tools.r8.utils.AndroidApp -> com.android.tools.r8.utils.j:
     com.android.tools.r8.StringResource proguardMapInputData -> g
     boolean $assertionsDisabled -> j
@@ -126589,27 +127680,27 @@
     int $r8$clinit -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:boolean assertNotNull(java.lang.Object):12:12 -> a
-com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.S4:
-com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.U4:
+com.android.tools.r8.utils.BiForEachable -> com.android.tools.r8.internal.U4:
+com.android.tools.r8.utils.BiMapContainer -> com.android.tools.r8.internal.W4:
     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.V4:
+com.android.tools.r8.utils.BiPredicateUtils -> com.android.tools.r8.internal.X4:
     boolean lambda$alwaysFalse$0(java.lang.Object,java.lang.Object) -> a
     1:1:java.util.function.BiPredicate alwaysFalse():12:12 -> a
     boolean lambda$alwaysTrue$1(java.lang.Object,java.lang.Object) -> b
     1:1:java.util.function.BiPredicate alwaysTrue():16:16 -> b
-com.android.tools.r8.utils.BitSetUtils -> com.android.tools.r8.internal.q5:
+com.android.tools.r8.utils.BitSetUtils -> com.android.tools.r8.internal.s5:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:boolean verifyLessThanOrEqualTo(java.util.BitSet,java.util.BitSet):27:27 -> a
     2:3:java.util.BitSet com.android.tools.r8.utils.BitSetUtils.or(java.util.BitSet,java.util.BitSet):21:22 -> a
     2:3:boolean verifyLessThanOrEqualTo(java.util.BitSet,java.util.BitSet):27 -> a
     4:4:boolean verifyLessThanOrEqualTo(java.util.BitSet,java.util.BitSet):27:27 -> a
-com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.r5:
+com.android.tools.r8.utils.BitUtils -> com.android.tools.r8.internal.t5:
     boolean isBitInMaskSet(int,int) -> a
     boolean isBitSet(int,int) -> b
-com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.v5:
+com.android.tools.r8.utils.BooleanBox -> com.android.tools.r8.internal.x5:
     boolean value -> a
     boolean assigned -> b
     1:1:void <init>():14:14 -> <init>
@@ -126626,7 +127717,7 @@
     1:1:boolean isTrue():35:35 -> c
     2:3:void set(boolean):43:44 -> c
     1:1:void set():39:39 -> d
-com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.G5:
+com.android.tools.r8.utils.BooleanLatticeElement -> com.android.tools.r8.internal.I5:
     1:1:void <init>():27:27 -> <init>
     boolean isFalse() -> a
     1:1:boolean isPossiblyFalse():52:52 -> b
@@ -126634,20 +127725,20 @@
     boolean isTrue() -> d
     boolean isUnknown() -> e
     1:1:int hashCode():74:74 -> hashCode
-com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.N5:
+com.android.tools.r8.utils.BooleanUtils -> com.android.tools.r8.internal.P5:
     java.lang.Boolean[] VALUES -> a
     int $r8$clinit -> b
     1:1:void <clinit>():8:8 -> <clinit>
     int intValue(boolean) -> a
     boolean xor(boolean,boolean) -> a
     1:1:java.lang.Boolean[] values():21:21 -> a
-com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.d6:
+com.android.tools.r8.utils.Box -> com.android.tools.r8.internal.f6:
     1:1:void <init>():12:12 -> <init>
     2:2:void <init>(java.lang.Object):15:15 -> <init>
     1:1:java.lang.Object computeIfAbsent(java.util.function.Supplier):25:25 -> a
     2:2:java.lang.Object get():30:30 -> a
     3:3:void set(java.lang.Object):40:40 -> a
-com.android.tools.r8.utils.BoxBase -> com.android.tools.r8.internal.e6:
+com.android.tools.r8.utils.BoxBase -> com.android.tools.r8.internal.g6:
     java.lang.Object value -> a
     1:1:void <init>():15:15 -> <init>
     2:3:void <init>(java.lang.Object):17:18 -> <init>
@@ -126657,7 +127748,7 @@
     1:1:boolean isSet():53:53 -> b
     1:5:boolean equals(java.lang.Object):58:62 -> equals
     1:1:int hashCode():67:67 -> hashCode
-com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.c8:
+com.android.tools.r8.utils.CfLineToMethodMapper -> com.android.tools.r8.internal.f8:
     java.util.Map sourceMethodMapping -> a
     com.android.tools.r8.utils.AndroidApp inputApp -> b
     boolean $assertionsDisabled -> c
@@ -126668,7 +127759,7 @@
     2:7:java.lang.String lookupNameAndDescriptor(java.lang.String,int):31:36 -> a
     8:30:void readLineNumbersFromClassFiles():40:62 -> a
     31:36:void lambda$readLineNumbersFromClassFiles$0(com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor,com.android.tools.r8.ProgramResource):46:51 -> a
-com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.a8:
+com.android.tools.r8.utils.CfLineToMethodMapper$ClassVisitor -> com.android.tools.r8.internal.d8:
     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>
@@ -126686,13 +127777,13 @@
     120:120: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
     114:114: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.b8:
+com.android.tools.r8.utils.CfLineToMethodMapper$MethodLineVisitor -> com.android.tools.r8.internal.e8:
     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.p9:
+com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.s9:
     java.util.Stack opened -> b
     java.lang.StringBuilder builder -> a
     int nextUnusedValue -> c
@@ -126718,14 +127809,14 @@
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49 -> d
     3:3:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):50:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.r9:
+com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.u9:
     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.q9:
+com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.t9:
     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.Ja:
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.Ma:
     java.util.Map classes -> a
     java.util.concurrent.atomic.AtomicReference classProvider -> b
     boolean $assertionsDisabled -> c
@@ -126754,7 +127845,7 @@
     com.android.tools.r8.graph.ClassKind getClassKind() -> e
     1:1:boolean isFullyLoaded():249:249 -> f
     1:1:java.lang.String toString():80:80 -> toString
-com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.Ia:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.La:
     com.android.tools.r8.graph.DexType type -> d
     boolean ready -> f
     boolean $assertionsDisabled -> g
@@ -126785,7 +127876,7 @@
     638:638:void lambda$get$0(com.android.tools.r8.graph.DexClass):287 -> a
     639:639:void lambda$get$0(com.android.tools.r8.graph.DexClass):287:287 -> a
     1:1:java.lang.Object get():255:255 -> get
-com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.eb:
+com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.hb:
     com.android.tools.r8.graph.ClassKind classKind -> a
     1:2:void <init>(com.android.tools.r8.graph.ClassKind):29:30 -> <init>
     void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer) -> a
@@ -126797,7 +127888,7 @@
     4:4:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):67 -> a
     5:8:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):68:71 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():35:35 -> b
-com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.ab:
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.db:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
@@ -126822,14 +127913,14 @@
     126:126:java.lang.String toString():123:123 -> toString
     127:127:java.lang.String toString():123:123 -> toString
     124:124:java.lang.String toString():123:123 -> toString
-com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.bb:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.eb:
     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):194:194 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List):198:199 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):204:205 -> a
     3:5:java.util.Collection collectTypes():211:213 -> a
     1:8:java.lang.String toString():220:227 -> toString
-com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.tools.r8.internal.cb:
+com.android.tools.r8.utils.ClassProvider$FilteringClassProvider -> com.android.tools.r8.internal.fb:
     java.util.Set filteredOut -> c
     com.android.tools.r8.utils.ClassProvider provider -> b
     boolean $assertionsDisabled -> d
@@ -126847,7 +127938,7 @@
     6:9:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):175:178 -> a
     10:11:java.util.Collection collectTypes():183:184 -> a
     1:1:java.lang.String toString():190:190 -> toString
-com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.db:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.gb:
     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):127:127 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap):131:132 -> <init>
@@ -126859,7 +127950,7 @@
     152:152:java.lang.String toString():149:149 -> toString
     153:153:java.lang.String toString():149:149 -> toString
     150:150:java.lang.String toString():149:149 -> toString
-com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.hb:
+com.android.tools.r8.utils.ClassReferenceUtils -> com.android.tools.r8.internal.kb:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:2:void <clinit>():16:17 -> <clinit>
@@ -126873,7 +127964,7 @@
     5:5:int compare(com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.MethodReference):31 -> a
     6:6:int compare(com.android.tools.r8.references.ClassReference,com.android.tools.r8.references.MethodReference):31:31 -> a
     7:7:java.util.Comparator getClassReferenceComparator():36:36 -> a
-com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.Eb:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.Hb:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):19:19 -> <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
@@ -126908,7 +127999,7 @@
     46:46:java.lang.String toString():43:43 -> toString
     47:47:java.lang.String toString():43:43 -> toString
     44:44:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.uc:
+com.android.tools.r8.utils.CollectionUtils -> com.android.tools.r8.internal.xc:
     1:1:java.util.Set mergeSets(java.util.Collection,java.util.Collection):22:22 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder.addAll(java.lang.Iterable):448:448 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.addAll(java.lang.Iterable):535 -> a
@@ -126926,21 +128017,21 @@
     5:5:java.util.Set mergeSets(java.util.Collection,java.util.Collection):24 -> a
     6:6:java.util.Set mergeSets(java.util.Collection,java.util.Collection):25:25 -> a
     7:8:java.util.Collection sort(java.util.Collection,java.util.Comparator):36:37 -> a
-com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.Ec:
+com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.Hc:
     1:3:int lambda$listComparator$0(java.util.Comparator,java.util.List,java.util.List):18:20 -> a
     4:4:java.util.Comparator arrayComparator(java.util.Comparator):57:57 -> a
     5:7:int lambda$arrayComparator$1(java.util.Comparator,java.lang.Object[],java.lang.Object[]):58:60 -> a
     8:8:java.util.Comparator unreachableComparator():67:67 -> a
     9:9:int lambda$unreachableComparator$2(java.lang.Object,java.lang.Object):68:68 -> a
     1:1:java.util.Comparator listComparator(java.util.Comparator):17:17 -> b
-com.android.tools.r8.utils.CompareResult$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Fc:
+com.android.tools.r8.utils.CompareResult$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.Ic:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
     com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.fromComparisonResult(int) -> a
     boolean com.android.tools.r8.utils.CompareResult.isEqual() -> b
     int getComparisonResult(int) -> c
       # {"id":"com.android.tools.r8.synthesized"}
-com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.se:
+com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.ve:
     void lambda$emptyBiConsumer$5(java.lang.Object,java.lang.Object) -> a
     void lambda$emptyConsumer$4(java.lang.Object) -> a
     1:1:java.util.function.Consumer acceptIfNotSeen(java.util.function.Consumer,java.util.Set):30:30 -> a
@@ -126951,7 +128042,7 @@
     void lambda$emptyThrowingConsumer$6(java.lang.Object) -> b
     1:1:java.util.function.Consumer emptyConsumer():43:43 -> b
     1:1:com.android.tools.r8.utils.ThrowingConsumer emptyThrowingConsumer():51:51 -> c
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase -> com.android.tools.r8.internal.Nf:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase -> com.android.tools.r8.internal.Rf:
     java.util.Map nodeToNodeWithStateMap -> b
     java.util.ArrayDeque workList -> a
     boolean $assertionsDisabled -> c
@@ -126975,9 +128066,9 @@
     20:20:boolean com.android.tools.r8.utils.TraversalContinuation.shouldBreak():151:151 -> c
     20:20:com.android.tools.r8.utils.TraversalContinuation run(java.util.Collection):158 -> c
     21:25:com.android.tools.r8.utils.TraversalContinuation run(java.util.Collection):159:163 -> c
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNode -> com.android.tools.r8.internal.If:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNode -> com.android.tools.r8.internal.Mf:
     java.lang.Object getNode() -> a
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl -> com.android.tools.r8.internal.Jf:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeImpl -> com.android.tools.r8.internal.Nf:
     com.android.tools.r8.utils.DepthFirstSearchWorkListBase$ProcessingState processingState -> b
     java.lang.Object node -> a
     boolean $assertionsDisabled -> c
@@ -126991,11 +128082,11 @@
     1:1:boolean seenAndNotProcessed():78:78 -> f
     1:2:void setFinished():67:68 -> g
     1:1:void setWaiting():63:63 -> h
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState -> com.android.tools.r8.internal.Kf:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithState -> com.android.tools.r8.internal.Of:
     void setState(java.lang.Object) -> a
     java.lang.Object getState() -> b
     boolean hasState() -> c
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl -> com.android.tools.r8.internal.Lf:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl -> com.android.tools.r8.internal.Pf:
     java.lang.Object state -> d
     1:1:void <init>(java.lang.Object,com.android.tools.r8.utils.DepthFirstSearchWorkListBase$1):82:82 -> <init>
     2:2:void <init>(java.lang.Object):87:87 -> <init>
@@ -127003,7 +128094,7 @@
     2:2:void setState(java.lang.Object):97:97 -> a
     1:1:java.lang.Object getState():92:92 -> b
     1:1:boolean hasState():102:102 -> c
-com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList -> com.android.tools.r8.internal.Mf:
+com.android.tools.r8.utils.DepthFirstSearchWorkListBase$StatefulDepthFirstSearchWorkList -> com.android.tools.r8.internal.Qf:
     java.util.Map childStateMap -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():197:197 -> <clinit>
@@ -127018,9 +128109,9 @@
     1:4:com.android.tools.r8.utils.TraversalContinuation internalOnVisit(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):232:235 -> b
     1:3:java.util.List lambda$internalOnJoin$1(com.android.tools.r8.utils.DepthFirstSearchWorkListBase$DFSNodeWithStateImpl):251:251 -> c
     1:1:java.lang.Object lambda$getFinalStateForRoots$2(java.lang.Object):258:258 -> d
-com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.Qf:
+com.android.tools.r8.utils.DequeUtils -> com.android.tools.r8.internal.Uf:
     1:2:java.util.Deque newArrayDeque(java.lang.Object):13:14 -> a
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.Tf:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.Xf:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -127181,13 +128272,13 @@
     6:10:boolean isDescriptor(java.lang.String):253 -> 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.Sf:
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.Wf:
     java.lang.String module -> a
     java.lang.String descriptor -> b
     1:3:void <init>(java.lang.String,java.lang.String):623:625 -> <init>
     1:1:java.lang.String getDescriptor():633:633 -> a
     1:1:java.lang.String getModule():629:629 -> b
-com.android.tools.r8.utils.DeterminismChecker -> com.android.tools.r8.internal.Cg:
+com.android.tools.r8.utils.DeterminismChecker -> com.android.tools.r8.internal.Gg:
     com.android.tools.r8.utils.DeterminismChecker$LineCallbackSupplier callbackFactory -> a
     1:2:void <init>(com.android.tools.r8.utils.DeterminismChecker$LineCallbackSupplier):74:75 -> <init>
     1:1:com.android.tools.r8.utils.DeterminismChecker createWithFileBacking(java.nio.file.Path):33:33 -> a
@@ -127202,7 +128293,7 @@
     22:25:void accept(com.android.tools.r8.utils.ThrowingConsumer):90:90 -> a
     26:34:void check(com.android.tools.r8.graph.AppView):96:96 -> a
     42:42:void check(com.android.tools.r8.graph.AppView):104:104 -> a
-com.android.tools.r8.utils.DeterminismChecker$1 -> com.android.tools.r8.internal.xg:
+com.android.tools.r8.utils.DeterminismChecker$1 -> com.android.tools.r8.internal.Bg:
     java.nio.file.Path val$directory -> b
     int index -> a
     1:4:void <init>(java.nio.file.Path):34:37 -> <init>
@@ -127213,9 +128304,9 @@
     60:60:com.android.tools.r8.utils.DeterminismChecker$LineCallback createCallback():42:42 -> a
     61:61:com.android.tools.r8.utils.DeterminismChecker$LineCallback createCallback():42:42 -> a
     44:58:com.android.tools.r8.utils.DeterminismChecker$LineCallback createCallback():42:56 -> a
-com.android.tools.r8.utils.DeterminismChecker$LineCallback -> com.android.tools.r8.internal.yg:
+com.android.tools.r8.utils.DeterminismChecker$LineCallback -> com.android.tools.r8.internal.Cg:
     boolean onLine(java.lang.String) -> a
-com.android.tools.r8.utils.DeterminismChecker$LineCallbackChecker -> com.android.tools.r8.internal.zg:
+com.android.tools.r8.utils.DeterminismChecker$LineCallbackChecker -> com.android.tools.r8.internal.Dg:
     java.io.BufferedReader reader -> b
     1:2:void <init>(java.io.BufferedReader):148:149 -> <init>
     1:1:java.lang.String com.android.tools.r8.utils.DeterminismChecker.escape(java.lang.String):140:140 -> a
@@ -127233,8 +128324,8 @@
     171:171:boolean onLine(java.lang.String):158:158 -> a
     164:164:boolean onLine(java.lang.String):158:158 -> a
     1:1:void close():166:166 -> close
-com.android.tools.r8.utils.DeterminismChecker$LineCallbackSupplier -> com.android.tools.r8.internal.Ag:
-com.android.tools.r8.utils.DeterminismChecker$LineCallbackWriter -> com.android.tools.r8.internal.Bg:
+com.android.tools.r8.utils.DeterminismChecker$LineCallbackSupplier -> com.android.tools.r8.internal.Eg:
+com.android.tools.r8.utils.DeterminismChecker$LineCallbackWriter -> com.android.tools.r8.internal.Fg:
     java.io.Writer writer -> b
     1:2:void <init>(java.io.Writer):175:176 -> <init>
     1:1:boolean onLine(java.lang.String):181:181 -> a
@@ -127243,7 +128334,7 @@
     2:2:boolean onLine(java.lang.String):181 -> a
     3:4:boolean onLine(java.lang.String):181:182 -> a
     1:1:void close():188:188 -> close
-com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.Mh:
+com.android.tools.r8.utils.DexUtils -> com.android.tools.r8.internal.Qh:
     1:1:java.lang.String getDefaultDexFileName(int):10:10 -> a
     2:2:java.lang.String getDefaultDexFileName(int):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":14,"2":15,"3":16}}
@@ -127251,7 +128342,7 @@
     15:15:java.lang.String getDefaultDexFileName(int):11:11 -> a
     16:16:java.lang.String getDefaultDexFileName(int):11:11 -> a
     13:13:java.lang.String getDefaultDexFileName(int):11:11 -> a
-com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.Oh:
+com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.Sh:
     com.android.tools.r8.utils.DexVersion[] $VALUES -> h
     int dexVersion -> b
     com.android.tools.r8.utils.DexVersion V35 -> d
@@ -127278,10 +128369,10 @@
     1:1:int getIntValue():28:28 -> b
     2:2:boolean matchesApiLevel(com.android.tools.r8.utils.AndroidApiLevel):36:36 -> b
     1:1:com.android.tools.r8.utils.DexVersion[] values():12:12 -> c
-com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.Nh:
+com.android.tools.r8.utils.DexVersion$1 -> com.android.tools.r8.internal.Rh:
     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.Rh:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.Vh:
     java.nio.file.Path root -> a
     1:3:void <init>(java.nio.file.Path):24:26 -> <init>
     1:5:void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler):39:43 -> a
@@ -127296,7 +128387,7 @@
     72:72:void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler):52:52 -> a
     77:82:void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):61:66 -> a
     83:83:java.nio.file.Path getPath() -> a
-com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.Uh:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.Yh:
     java.util.Map parent -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -127317,28 +128408,28 @@
     162:162:java.lang.String toString():148:148 -> toString
     164:164:java.lang.String toString():150:150 -> toString
     153:160:java.lang.String toString():151:158 -> toString
-com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.gi:
+com.android.tools.r8.utils.DumpInputFlags -> com.android.tools.r8.internal.ki:
     1:1:void <init>():8:8 -> <init>
     java.nio.file.Path getDumpInputToDirectory() -> a
     1:1:com.android.tools.r8.utils.DumpInputFlags dumpToDirectory(java.nio.file.Path):39:39 -> a
     java.nio.file.Path getDumpInputToFile() -> b
     1:1:com.android.tools.r8.utils.DumpInputFlags dumpToFile(java.nio.file.Path):25:25 -> b
     1:1:com.android.tools.r8.utils.DumpInputFlags noDump():11:11 -> c
-com.android.tools.r8.utils.DumpInputFlags$1 -> com.android.tools.r8.internal.di:
+com.android.tools.r8.utils.DumpInputFlags$1 -> com.android.tools.r8.internal.hi:
     1:1:void <init>():11:11 -> <init>
     java.nio.file.Path getDumpInputToDirectory() -> a
     java.nio.file.Path getDumpInputToFile() -> b
-com.android.tools.r8.utils.DumpInputFlags$2 -> com.android.tools.r8.internal.ei:
+com.android.tools.r8.utils.DumpInputFlags$2 -> com.android.tools.r8.internal.ii:
     java.nio.file.Path val$file -> a
     1:1:void <init>(java.nio.file.Path):25:25 -> <init>
     java.nio.file.Path getDumpInputToDirectory() -> a
     1:1:java.nio.file.Path getDumpInputToFile():28:28 -> b
-com.android.tools.r8.utils.DumpInputFlags$3 -> com.android.tools.r8.internal.fi:
+com.android.tools.r8.utils.DumpInputFlags$3 -> com.android.tools.r8.internal.ji:
     java.nio.file.Path val$file -> a
     1:1:void <init>(java.nio.file.Path):39:39 -> <init>
     1:1:java.nio.file.Path getDumpInputToDirectory():47:47 -> a
     java.nio.file.Path getDumpInputToFile() -> b
-com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.Ni:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.Ri:
     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
@@ -127358,6 +128449,9 @@
     1:9:long parseSigned(com.android.tools.r8.dex.DexReader,int):12:20 -> c
     10:14:int putUnsigned(com.android.tools.r8.dex.DexOutputBuffer,long,int):61:65 -> c
     1:5:long parseUnsigned(com.android.tools.r8.dex.DexReader,int):48:52 -> d
+com.android.tools.r8.utils.EntryUtils -> com.android.tools.r8.internal.dj:
+    1:1:java.util.function.Consumer accept(java.util.function.BiConsumer):14:14 -> a
+    2:2:void lambda$accept$0(java.util.function.BiConsumer,java.util.Map$Entry):14:14 -> a
 com.android.tools.r8.utils.ExceptionDiagnostic -> com.android.tools.r8.utils.ExceptionDiagnostic:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
@@ -127372,7 +128466,7 @@
     1:1:java.lang.String getDiagnosticMessage():65:65 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():51:51 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():56:56 -> getPosition
-com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.Qj:
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.Vj:
     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
@@ -127428,9 +128522,9 @@
     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
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.Qj$a:
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.Rj:
-com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.Sj:
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.Vj$a:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.Wj:
+com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.Xj:
     com.android.tools.r8.origin.Origin origin -> b
     com.android.tools.r8.position.Position position -> c
     1:3:void <init>(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):263:265 -> <init>
@@ -127559,7 +128653,7 @@
     159:159:java.lang.String part():77:77 -> part
     160:160:java.lang.String part():77:77 -> part
     161:161:java.lang.String part():77:77 -> part
-com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.Lk:
+com.android.tools.r8.utils.FieldReferenceUtils -> com.android.tools.r8.internal.Qk:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -127582,7 +128676,7 @@
     8:8:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
     8:8:int lambda$static$0(com.android.tools.r8.references.FieldReference,com.android.tools.r8.references.FieldReference):29 -> b
     9:9:int lambda$static$0(com.android.tools.r8.references.FieldReference,com.android.tools.r8.references.FieldReference):31:31 -> b
-com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Ok:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Tk:
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
@@ -127593,7 +128687,7 @@
     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.Wk:
+com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.bl:
     boolean isAndroid -> a
     boolean $assertionsDisabled -> b
     1:17:void <clinit>():21:37 -> <clinit>
@@ -127625,9 +128719,9 @@
     1:1:java.util.List readAllLines(java.nio.file.Path):100:100 -> h
 com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.y:
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
-com.android.tools.r8.utils.FlagFile -> com.android.tools.r8.internal.nl:
+com.android.tools.r8.utils.FlagFile -> com.android.tools.r8.internal.sl:
     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.ml:
+com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.rl:
     java.nio.file.Path path -> f
     1:2:void <init>(java.nio.file.Path):23:24 -> <init>
     1:1:java.lang.String part():0:0 -> part
@@ -127636,21 +128730,21 @@
     32:32:java.lang.String part():29:29 -> part
     33:33:java.lang.String part():29:29 -> part
     30:30:java.lang.String part():29:29 -> part
-com.android.tools.r8.utils.ForEachUtils -> com.android.tools.r8.internal.Al:
+com.android.tools.r8.utils.ForEachUtils -> com.android.tools.r8.internal.Fl:
     1:6:boolean allMatch(java.util.function.Consumer,java.util.function.Predicate):13:18 -> a
     7:7:void lambda$allMatch$0(com.android.tools.r8.utils.BooleanBox,java.util.function.Predicate,java.lang.Object):16:16 -> a
-com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.Bl:
-com.android.tools.r8.utils.ForEachableUtils -> com.android.tools.r8.internal.Cl:
+com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.Gl:
+com.android.tools.r8.utils.ForEachableUtils -> com.android.tools.r8.internal.Hl:
     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.rm:
+com.android.tools.r8.utils.FunctionUtils -> com.android.tools.r8.internal.wm:
     java.lang.Object getFirst(java.lang.Object,java.lang.Object) -> a
     java.lang.Object getFirst(java.lang.Object,java.lang.Object,java.lang.Object) -> a
     1:1:java.lang.Object applyOrElse(java.lang.Object,java.util.function.Function,java.lang.Object):15:15 -> a
     2:3:void forEachApply(java.lang.Iterable,java.util.function.Function,java.lang.Object):28:29 -> a
     4:4:java.util.function.Function ignoreArgument(java.util.function.Supplier):42:42 -> a
     5:5:java.lang.Object lambda$ignoreArgument$2(java.util.function.Supplier,java.lang.Object):42:42 -> a
-com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.Dn:
+com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.In:
     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
@@ -127660,28 +128754,28 @@
     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.to:
+com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.yo:
     java.lang.Iterable order(java.lang.Iterable) -> a
-com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.ro:
+com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.wo:
     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.so:
+com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.xo:
     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.Go:
+com.android.tools.r8.utils.IdentifierUtils -> com.android.tools.r8.internal.Lo:
     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:1:boolean isRelaxedDexIdentifierPart(int):18:18 -> c
     boolean isSimpleNameChar(int) -> d
-com.android.tools.r8.utils.Int2StructuralItemArrayMap -> com.android.tools.r8.internal.pu:
+com.android.tools.r8.utils.Int2StructuralItemArrayMap -> com.android.tools.r8.internal.vu:
     int[] keys -> b
     java.util.List values -> c
     boolean $assertionsDisabled -> d
@@ -127698,7 +128792,7 @@
     1:2:boolean equals(java.lang.Object):63:64 -> equals
     1:1:int hashCode():69:69 -> hashCode
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():37:37 -> m
-com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder -> com.android.tools.r8.internal.ou:
+com.android.tools.r8.utils.Int2StructuralItemArrayMap$Builder -> com.android.tools.r8.internal.uu:
     java.util.List keys -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder values -> b
     1:1:void <init>(com.android.tools.r8.utils.Int2StructuralItemArrayMap$1):80:80 -> <init>
@@ -127715,7 +128809,7 @@
     11:11:com.android.tools.r8.utils.Int2StructuralItemArrayMap build():98 -> a
     12:12:com.android.tools.r8.utils.Int2StructuralItemArrayMap build():98:98 -> a
     1:1:boolean isEmpty():94:94 -> b
-com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.wu:
+com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.Cu:
     boolean $assertionsDisabled -> b
     int value -> a
     1:1:void <clinit>():7:7 -> <clinit>
@@ -127729,11 +128823,11 @@
     1:1:void increment():48:48 -> c
     2:3:void increment(int):52:53 -> c
     1:1:void set(int):66:66 -> d
-com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.Ou:
+com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.Uu:
     void accept(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.Pu:
+com.android.tools.r8.utils.IntObjPredicate -> com.android.tools.r8.internal.Vu:
     boolean test(int,java.lang.Object) -> a
-com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.Qu:
+com.android.tools.r8.utils.IntObjToObjFunction -> com.android.tools.r8.internal.Wu:
     java.lang.Object apply(int,java.lang.Object) -> a
 com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.z:
     java.util.zip.ZipFile openedZipFile -> e
@@ -127767,10 +128861,10 @@
     122:122:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> getProgramResource
     122:122:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     123:123:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer -> com.android.tools.r8.internal.Av:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer -> com.android.tools.r8.internal.Gv:
     1:1:void <init>():33:33 -> <init>
     void finished(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder -> com.android.tools.r8.internal.vv:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder -> com.android.tools.r8.internal.Bv:
     java.util.List content -> b
     com.android.tools.r8.ProgramResource$Kind kind -> a
     boolean $assertionsDisabled -> c
@@ -127794,41 +128888,41 @@
     28:29:void addGlobalSynthetic(java.lang.String,byte[]):54 -> a
     30:30:void com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder.add(java.lang.String,byte[]):58:58 -> a
     30:30:void addGlobalSynthetic(java.lang.String,byte[]):54 -> a
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsCfConsumer -> com.android.tools.r8.internal.wv:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsCfConsumer -> com.android.tools.r8.internal.Cv:
     1:1:void <init>(com.android.tools.r8.GlobalSyntheticsConsumer,com.android.tools.r8.graph.AppView):170:170 -> <init>
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():175:175 -> a
     1:1:void accept(com.android.tools.r8.ByteDataView,java.lang.String,com.android.tools.r8.DiagnosticsHandler):180:180 -> accept
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsDexIndexedConsumer -> com.android.tools.r8.internal.xv:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsDexIndexedConsumer -> com.android.tools.r8.internal.Dv:
     com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder builder -> b
     com.android.tools.r8.GlobalSyntheticsConsumer clientConsumer -> a
     1:1:void <init>(com.android.tools.r8.GlobalSyntheticsConsumer):100:100 -> <init>
     2:5:void <init>(com.android.tools.r8.GlobalSyntheticsConsumer):98:101 -> <init>
     1:1:void finished(com.android.tools.r8.graph.AppView):122:122 -> a
-    2:2:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    2:2:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     2:2:void finished(com.android.tools.r8.graph.AppView):124 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    3:3:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     3:3:void finished(com.android.tools.r8.graph.AppView):124 -> a
     4:7:void finished(com.android.tools.r8.graph.AppView):124:127 -> a
-    8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     8:8:void finished(com.android.tools.r8.graph.AppView):127 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    9:9:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    9:9:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     9:9:void finished(com.android.tools.r8.graph.AppView):127 -> a
     10:12:void finished(com.android.tools.r8.graph.AppView):127:129 -> a
-    13:13:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    13:13:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     13:13:void finished(com.android.tools.r8.graph.AppView):129 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    14:14:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     14:14:void finished(com.android.tools.r8.graph.AppView):129 -> a
     15:15:void finished(com.android.tools.r8.graph.AppView):129:129 -> a
     1:1:void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):110:110 -> accept
     1:1:void finished(com.android.tools.r8.DiagnosticsHandler):115:115 -> finished
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsDexPerFileConsumer -> com.android.tools.r8.internal.yv:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$InternalGlobalSyntheticsDexPerFileConsumer -> com.android.tools.r8.internal.Ev:
     1:1:void <init>(com.android.tools.r8.GlobalSyntheticsConsumer,com.android.tools.r8.graph.AppView):143:143 -> <init>
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():148:148 -> a
     1:1:void accept(java.lang.String,com.android.tools.r8.ByteDataView,java.util.Set,com.android.tools.r8.DiagnosticsHandler):157:157 -> accept
-com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$PerFileBase -> com.android.tools.r8.internal.zv:
+com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$PerFileBase -> com.android.tools.r8.internal.Fv:
     java.util.Map globalToBytes -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.GlobalSyntheticsConsumer clientConsumer -> b
@@ -127838,23 +128932,23 @@
     2:6:void <init>(com.android.tools.r8.GlobalSyntheticsConsumer,com.android.tools.r8.graph.AppView):188:192 -> <init>
     com.android.tools.r8.ProgramResource$Kind getKind() -> a
     1:38:void finished(com.android.tools.r8.graph.AppView):205:242 -> a
-    39:39:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    39:39:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     39:39:void finished(com.android.tools.r8.graph.AppView):242 -> a
     40:40:void finished(com.android.tools.r8.graph.AppView):242:242 -> a
     41:41:java.util.Set lambda$finished$0(com.android.tools.r8.graph.DexType):217:217 -> a
     42:43:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object[]):52:53 -> a
     42:43:java.util.Set lambda$finished$0(com.android.tools.r8.graph.DexType):217 -> a
     44:51:void lambda$finished$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Set):224:231 -> a
-    52:52:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    52:52:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     52:52:void lambda$finished$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Set):233 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    53:53:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    53:53:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     53:53:void lambda$finished$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Set):233 -> a
     54:59:void lambda$finished$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Set):233:238 -> a
-    60:60:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    60:60:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     60:60:void lambda$finished$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Set):239 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    61:61:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():535:535 -> a
+    61:61:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():547:547 -> a
     61:61:void lambda$finished$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Set):239 -> a
     62:62:void lambda$finished$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,java.util.Set):236:236 -> a
     63:63:void lambda$finished$1(com.android.tools.r8.utils.InternalGlobalSyntheticsProgramConsumer$GlobalsFileBuilder,com.android.tools.r8.graph.DexType):228:228 -> a
@@ -127874,558 +128968,554 @@
     51:91:void ensureResources():52:92 -> a
     92:92:com.android.tools.r8.ProgramResource lambda$ensureResources$0(com.android.tools.r8.origin.ArchiveEntryOrigin,byte[],java.util.Set,com.android.tools.r8.ProgramResource$Kind):77:77 -> a
     1:4:java.util.Collection getProgramResources():37:40 -> getProgramResources
-com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.Ev:
-    com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions openClosedInterfacesOptions -> S0
+com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.Kv:
     boolean enableCfByteCodePassThrough -> f0
     boolean enableStringSwitchConversion -> P
     boolean printTimes -> i
-    boolean $assertionsDisabled -> B1
+    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> X0
     boolean invalidDebugInfoFatal -> b0
+    java.util.Set invalidLibraryClasses -> z1
     boolean enableLoopUnrolling -> X
     boolean enableFieldBitAccessAnalysis -> q
-    com.android.tools.r8.experimental.startup.StartupOptions startupOptions -> X0
+    com.android.tools.r8.SourceFileProvider sourceFileProvider -> w1
     java.lang.String synthesizedClassPrefix -> Y
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> m0
-    java.util.function.Consumer syntheticProguardRulesConsumer -> t1
+    java.util.Set extensiveLoggingFilter -> m0
     boolean enableInitializedClassesAnalysis -> y
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> h1
-    com.android.tools.r8.StringConsumer configurationConsumer -> l1
+    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> V0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> l1
     java.util.List outputInspections -> h
-    boolean debug -> N0
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> q1
-    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> K0
-    boolean relocatorCompilation -> o1
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> p1
-    com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelTestingOptions -> V0
-    boolean forceProguardCompatibility -> J0
-    boolean enableTreeShaking -> E0
+    boolean skipIR -> N0
+    boolean reportMissingClassesInInnerClassAttributes -> J0
+    boolean enableMainDexListCheck -> E0
     boolean forceAnnotateSynthetics -> I
     boolean printMemory -> j
-    boolean lookupLibraryBeforeProgram -> A0
-    boolean enableInheritanceClassInDexDistributor -> b1
-    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> O0
+    boolean processCovariantReturnTypeAnnotations -> A0
+    boolean minimalMainDex -> b1
+    com.android.tools.r8.MapIdProvider mapIdProvider -> v1
     boolean enableVerticalClassMerging -> r
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> x0
+    com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification machineDesugaredLibrarySpecification -> o1
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> g
-    boolean processCovariantReturnTypeAnnotations -> z0
+    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> w0
+    java.util.List methodsFilter -> o0
+    boolean enableLoadStoreOptimization -> v0
     boolean enableSideEffectAnalysis -> z
-    boolean ignoreBootClasspathEnumsForMaindexTracing -> r0
-    com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions -> Q0
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> d1
+    boolean retainCompileTimeAnnotations -> r0
     boolean cfToCfDesugar -> H
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> s1
-    java.util.Map warningInvalidParameterAnnotations -> e1
-    boolean hasMarker -> j0
+    java.util.Map missingEnclosingMembers -> e1
+    com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions openClosedInterfacesOptions -> T0
     int callGraphLikelySpuriousCallEdgeThreshold -> M
     boolean createSingletonsForStatelessLambdas -> g0
+    com.android.tools.r8.experimental.startup.StartupOptions startupOptions -> Y0
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> q1
+    boolean $assertionsDisabled -> C1
     java.lang.String dumpInputToDirectory -> l
     boolean invalidDebugInfoStrict -> c0
-    java.util.Set invalidLibraryClasses -> y1
     boolean enableRedundantFieldLoadElimination -> V
     boolean enableClassInlining -> w
-    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> W0
-    java.util.List logArgumentsFilter -> t0
-    com.android.tools.r8.SourceFileProvider sourceFileProvider -> v1
-    java.util.Set extensiveLoggingFilter -> l0
+    com.android.tools.r8.dex.Marker marker -> l0
     boolean enableTreeShakingOfLibraryMethodOverrides -> E
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> r1
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> i1
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> r1
+    boolean relocatorCompilation -> p1
+    boolean debug -> O0
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> i1
     com.android.tools.r8.ProgramConsumer programConsumer -> d
+    boolean forceProguardCompatibility -> K0
+    com.android.tools.r8.StringConsumer configurationConsumer -> m1
     boolean enableSwitchRewriting -> O
-    boolean enableMinification -> F0
-    java.util.Map missingEnclosingMembers -> d1
-    boolean skipReadingDexCode -> g1
+    boolean enableTreeShaking -> F0
     boolean libraryInterfacesMayHaveStaticInitialization -> p
     java.lang.String dumpInputToFile -> k
-    boolean enableEnqueuerDeferredTracing -> B0
+    boolean lookupLibraryBeforeProgram -> B0
+    boolean enableInheritanceClassInDexDistributor -> c1
     com.android.tools.r8.GlobalSyntheticsConsumer globalSyntheticsConsumer -> e
     boolean enableRedundantConstNumberOptimization -> W
     boolean enableClassStaticizer -> x
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    com.android.tools.r8.MapIdProvider mapIdProvider -> u1
-    com.android.tools.r8.utils.ThrowingBiConsumer loadMachineDesugaredLibrarySpecification -> m1
-    boolean enableNestReduction -> w0
-    boolean pruneNonVissibleAnnotationClasses -> s0
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> c1
+    boolean ignoreBootClasspathEnumsForMaindexTracing -> s0
     com.android.tools.r8.utils.InternalOptions$NeverMergeGroup neverMerge -> o
     java.util.function.BiPredicate dexClassChecksumFilter -> G
     boolean encodeChecksums -> F
+    boolean hasMarker -> k0
     boolean passthroughDexCode -> m
     boolean ignoreJavaLibraryOverride -> d0
-    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> R0
+    java.util.List mainDexKeepRules -> a1
+    java.util.Set reportedMissingForDesugaring -> x1
     boolean enableVisibilityBridgeRemoval -> L
     boolean enableEnumUnboxing -> u
-    com.android.tools.r8.dex.Marker marker -> k0
+    java.util.List logArgumentsFilter -> u0
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean configurationDebugging -> L0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> s1
     java.lang.Thread mainThread -> N
-    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> T0
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> j1
-    boolean reportMissingClassesInEnclosingMethodAttribute -> H0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> j1
+    boolean ignoreMissingClasses -> H0
     boolean enableNameReflectionOptimization -> C
     boolean enableNeverMergePrefixes -> n
-    com.android.tools.r8.dump.DumpOptions dumpOptions -> i0
-    java.util.concurrent.atomic.AtomicBoolean reportedErrorReadingKotlinMetadataReflectively -> x1
-    boolean ignoreMissingClasses -> G0
-    boolean loadAllClassDefinitions -> C0
+    int SUPPORTED_DEX_VERSION -> B1
+    boolean enableMinification -> G0
+    boolean skipReadingDexCode -> h1
+    boolean enableEnqueuerDeferredTracing -> C0
     boolean enableInitializedClassesInInstanceMethodsAnalysis -> U
     boolean enableSimpleInliningConstraints -> v
-    com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions -> P0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> z0
+    com.android.tools.r8.utils.AndroidApiLevel minApiLevel -> p0
+    boolean enableNestReduction -> x0
+    boolean pruneNonVissibleAnnotationClasses -> t0
     com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> T
-    boolean intermediate -> p0
+    com.android.tools.r8.utils.ThrowingBiConsumer loadMachineDesugaredLibrarySpecification -> n1
     boolean emitNestAnnotationsInDex -> h0
     boolean enableStringConcatenationOptimization -> D
     int minimumStringSwitchSize -> Q
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> Y0
+    java.util.Map warningInvalidDebugInfo -> g1
     boolean ignoreMainDexMissingClasses -> e0
     boolean readDebugSetFileEvent -> J
     boolean useSmaliSyntax -> a0
-    java.util.Set reportedMissingForDesugaring -> w1
+    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> S0
     boolean enableEnumValueOptimization -> R
+    java.util.function.Consumer syntheticProguardRulesConsumer -> u1
     boolean enableUnusedInterfaceRemoval -> s
     int threadCount -> Z
-    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> U0
-    boolean skipIR -> M0
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> k1
-    com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> z1
+    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> U0
+    boolean configurationDebugging -> M0
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> k1
+    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> L0
     boolean enableDeterminismAnalysis -> A
-    boolean reportMissingClassesInInnerClassAttributes -> I0
-    int SUPPORTED_DEX_VERSION -> A1
-    boolean enableMainDexListCheck -> D0
+    com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelTestingOptions -> W0
+    boolean reportMissingClassesInEnclosingMethodAttribute -> I0
+    boolean loadAllClassDefinitions -> D0
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> f
-    boolean minimalMainDex -> a1
-    java.util.List mainDexKeepRules -> Z0
+    com.android.tools.r8.dump.DumpOptions dumpOptions -> j0
+    java.util.concurrent.atomic.AtomicBoolean reportedErrorReadingKotlinMetadataReflectively -> y1
+    com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> A1
     boolean disableL8AnnotationRemoval -> K
-    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> v0
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> y0
-    com.android.tools.r8.utils.AndroidApiLevel minApiLevel -> o0
-    com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineDesugaredLibrarySpecification machineDesugaredLibrarySpecification -> n1
+    com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions -> R0
+    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> P0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> y0
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> n0
     boolean enableEnumSwitchMapRemoval -> S
     boolean enableDevirtualization -> t
-    boolean enableLoadStoreOptimization -> u0
-    java.util.List methodsFilter -> n0
-    boolean retainCompileTimeAnnotations -> q0
-    java.util.Map warningInvalidDebugInfo -> f1
+    com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions -> Q0
+    boolean intermediate -> q0
+    java.util.Map warningInvalidParameterAnnotations -> f1
     boolean enableServiceLoaderRewriting -> B
-    1:31:void <clinit>():113:143 -> <clinit>
-    1:1:void <init>():175:175 -> <init>
-    2:878:void <init>():165:1041 -> <init>
-    879:883:void <init>():176:180 -> <init>
-    884:884:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):184:184 -> <init>
-    885:1761:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):165:1041 -> <init>
-    1762:1769:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):185:192 -> <init>
-    1770:1770:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):197:197 -> <init>
-    1771:2647:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):165:1041 -> <init>
-    2648:2668:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):198:218 -> <init>
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> A
-    1:1:boolean canHaveThisJitCodeDebuggingBug():2199 -> A
-    2:2:boolean canHaveThisJitCodeDebuggingBug():2199:2199 -> A
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():521:521 -> A0
-    1:1:boolean isGeneratingDex():517 -> A0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():525:525 -> A0
-    2:2:boolean isGeneratingDex():517 -> A0
-    1:1:boolean canHaveThisTypeVerifierBug():2190:2190 -> B
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> B
-    2:2:boolean canHaveThisTypeVerifierBug():2190 -> B
-    3:3:boolean canHaveThisTypeVerifierBug():2190:2190 -> B
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():462:462 -> B0
-    1:1:boolean isInterfaceMethodDesugaringEnabled():2082 -> B0
-    2:4:boolean isInterfaceMethodDesugaringEnabled():2085:2087 -> B0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> C
-    1:1:boolean canHaveTracingPastInstructionsStreamBug():2361 -> C
-    2:2:boolean canHaveTracingPastInstructionsStreamBug():2361:2361 -> C
-    1:1:boolean isKeepAttributesSignatureEnabled():694:694 -> C0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> D
-    1:1:boolean canHaveZipFileWithMissingCloseableBug():2485 -> D
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> D
-    2:2:boolean canHaveZipFileWithMissingCloseableBug():2485 -> D
-    3:3:boolean canHaveZipFileWithMissingCloseableBug():2485:2485 -> D
-    1:1:boolean isKeepEnclosingMethodAttributeEnabled():699:699 -> D0
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():2136:2136 -> E
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> E
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> E
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():2136 -> E
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> E
-    3:3:boolean canInitCauseAfterAssertionErrorObjectConstructor():2136 -> E
-    1:1:boolean isKeepInnerClassesAttributeEnabled():704:704 -> E0
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():2034:2034 -> F
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> F
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> F
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():2034 -> F
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> F
-    3:3:boolean canLeaveStaticInterfaceMethodInvokes():2034 -> F
-    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():709:709 -> F0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> G
-    1:1:boolean canParseNumbersWithPlusPrefix():2501 -> G
-    2:2:boolean canParseNumbersWithPlusPrefix():2501:2501 -> G
-    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():714:714 -> G0
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():2117:2117 -> H
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> H
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> H
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():2117 -> H
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> H
-    3:3:boolean canUseAssertionErrorTwoArgumentConstructor():2117 -> H
-    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():719:719 -> H0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> I
-    1:1:boolean canUseConstantMethodHandle():2010 -> I
-    2:2:boolean canUseConstantMethodHandle():2010:2010 -> I
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> I
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> I
-    3:3:boolean canUseConstantMethodHandle():2010 -> I
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> I
-    4:4:boolean canUseConstantMethodHandle():2010 -> I
-    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():724:724 -> I0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> J
-    1:1:boolean canUseConstantMethodType():2014 -> J
-    2:2:boolean canUseConstantMethodType():2014:2014 -> J
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> J
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> J
-    3:3:boolean canUseConstantMethodType():2014 -> J
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> J
-    4:4:boolean canUseConstantMethodType():2014 -> J
-    1:3:boolean isMinifying():653:653 -> J0
-    5:5:boolean isMinifying():655:655 -> J0
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():2022:2022 -> K
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> K
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> K
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():2022 -> K
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> K
-    3:3:boolean canUseDefaultAndStaticInterfaceMethods():2022 -> K
-    1:1:boolean isOptimizing():639:639 -> K0
-    1:2:boolean canUseFilledNewArrayOfObjects():2148:2149 -> L
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> L
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> L
-    3:3:boolean canUseFilledNewArrayOfObjects():2149 -> L
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> L
-    4:4:boolean canUseFilledNewArrayOfObjects():2149 -> L
-    1:1:boolean isRelease():643:643 -> L0
-    1:1:boolean canUseInputStackMaps():762:762 -> M
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> M
-    2:2:boolean canUseInputStackMaps():762 -> M
-    1:1:boolean isRepackagingEnabled():680:680 -> M0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1313:1313 -> M0
-    2:2:boolean isRepackagingEnabled():680 -> M0
+    boolean emitPermittedSubclassesAnnotationsInDex -> i0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> t1
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> Z0
+    1:31:void <clinit>():114:144 -> <clinit>
+    1:1:void <init>():176:176 -> <init>
+    2:853:void <init>():166:1017 -> <init>
+    854:858:void <init>():177:181 -> <init>
+    859:859:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):185:185 -> <init>
+    860:1711:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):166:1017 -> <init>
+    1712:1719:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):186:193 -> <init>
+    1720:1720:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):198:198 -> <init>
+    1721:2572:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):166:1017 -> <init>
+    2573:2593:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):199:219 -> <init>
+    1:1:boolean canHaveThisTypeVerifierBug():2170:2170 -> A
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> A
+    2:2:boolean canHaveThisTypeVerifierBug():2170 -> A
+    3:3:boolean canHaveThisTypeVerifierBug():2170:2170 -> A
+    1:1:boolean isKeepAttributesSignatureEnabled():699:699 -> A0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> B
+    1:1:boolean canHaveTracingPastInstructionsStreamBug():2341 -> B
+    2:2:boolean canHaveTracingPastInstructionsStreamBug():2341:2341 -> B
+    1:1:boolean isKeepEnclosingMethodAttributeEnabled():704:704 -> B0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> C
+    1:1:boolean canHaveZipFileWithMissingCloseableBug():2465 -> C
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> C
+    2:2:boolean canHaveZipFileWithMissingCloseableBug():2465 -> C
+    3:3:boolean canHaveZipFileWithMissingCloseableBug():2465:2465 -> C
+    1:1:boolean isKeepInnerClassesAttributeEnabled():709:709 -> C0
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():2116:2116 -> D
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> D
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> D
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():2116 -> D
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> D
+    3:3:boolean canInitCauseAfterAssertionErrorObjectConstructor():2116 -> D
+    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():714:714 -> D0
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():2014:2014 -> E
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> E
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> E
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():2014 -> E
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> E
+    3:3:boolean canLeaveStaticInterfaceMethodInvokes():2014 -> E
+    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():719:719 -> E0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> F
+    1:1:boolean canParseNumbersWithPlusPrefix():2481 -> F
+    2:2:boolean canParseNumbersWithPlusPrefix():2481:2481 -> F
+    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():724:724 -> F0
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():2097:2097 -> G
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> G
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> G
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():2097 -> G
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> G
+    3:3:boolean canUseAssertionErrorTwoArgumentConstructor():2097 -> G
+    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():729:729 -> G0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> H
+    1:1:boolean canUseConstantMethodHandle():1986 -> H
+    2:2:boolean canUseConstantMethodHandle():1986:1986 -> H
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> H
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> H
+    3:3:boolean canUseConstantMethodHandle():1986 -> H
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> H
+    4:4:boolean canUseConstantMethodHandle():1986 -> H
+    1:3:boolean isMinifying():658:658 -> H0
+    5:5:boolean isMinifying():660:660 -> H0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> I
+    1:1:boolean canUseConstantMethodType():1990 -> I
+    2:2:boolean canUseConstantMethodType():1990:1990 -> I
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> I
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> I
+    3:3:boolean canUseConstantMethodType():1990 -> I
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> I
+    4:4:boolean canUseConstantMethodType():1990 -> I
+    1:1:boolean isOptimizing():644:644 -> I0
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1998:1998 -> J
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> J
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> J
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1998 -> J
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> J
+    3:3:boolean canUseDefaultAndStaticInterfaceMethods():1998 -> J
+    1:1:boolean isRelease():648:648 -> J0
+    1:2:boolean canUseFilledNewArrayOfObjects():2128:2129 -> K
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> K
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> K
+    3:3:boolean canUseFilledNewArrayOfObjects():2129 -> K
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> K
+    4:4:boolean canUseFilledNewArrayOfObjects():2129 -> K
+    1:1:boolean isRepackagingEnabled():685:685 -> K0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1289:1289 -> K0
+    2:2:boolean isRepackagingEnabled():685 -> K0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1297:1297 -> M0
-    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1313 -> M0
-    3:3:boolean isRepackagingEnabled():680 -> M0
+    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1273:1273 -> K0
+    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1289 -> K0
+    3:3:boolean isRepackagingEnabled():685 -> K0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4:4:boolean isRepackagingEnabled():680:680 -> M0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> N
-    1:1:boolean canUseInvokeCustom():2018 -> N
-    2:2:boolean canUseInvokeCustom():2018:2018 -> N
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> N
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> N
-    3:3:boolean canUseInvokeCustom():2018 -> N
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> N
-    4:4:boolean canUseInvokeCustom():2018 -> N
-    1:3:boolean isShrinking():647:647 -> N0
-    5:5:boolean isShrinking():649:649 -> N0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> O
-    1:1:boolean canUseInvokePolymorphic():2006 -> O
-    2:2:boolean canUseInvokePolymorphic():2006:2006 -> O
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> O
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> O
-    3:3:boolean canUseInvokePolymorphic():2006 -> O
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> O
-    4:4:boolean canUseInvokePolymorphic():2006 -> O
-    1:1:boolean isStringSwitchConversionEnabled():2095:2095 -> O0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> P
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():2002 -> P
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():2002:2002 -> P
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> P
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> P
-    3:3:boolean canUseInvokePolymorphicOnVarHandle():2002 -> P
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> P
-    4:4:boolean canUseInvokePolymorphicOnVarHandle():2002 -> P
-    1:6:void keepDebugRelatedInformation():223:228 -> P0
-    1:1:boolean canUseJavaUtilObjects():2104:2104 -> Q
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> Q
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> Q
-    2:2:boolean canUseJavaUtilObjects():2104 -> Q
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> Q
-    3:3:boolean canUseJavaUtilObjects():2104 -> Q
-    1:2:boolean keepInnerClassStructure():757:758 -> Q0
-    1:1:boolean canUseJavaUtilObjectsIsNull():2108:2108 -> R
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> R
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> R
-    2:2:boolean canUseJavaUtilObjectsIsNull():2108 -> R
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> R
-    3:3:boolean canUseJavaUtilObjectsIsNull():2108 -> R
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():832:832 -> R0
-    1:2:boolean canUseMultidex():2099:2100 -> S
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> S
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> S
-    3:3:boolean canUseMultidex():2100 -> S
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> S
-    4:4:boolean canUseMultidex():2100 -> S
-    1:1:boolean parseSignatureAttribute():689:689 -> S0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2071:2071 -> T
-    1:1:boolean canUseNativeDexPcInsteadOfDebugInfo():2075 -> T
-    2:2:boolean canUseNativeDexPcInsteadOfDebugInfo():2075:2075 -> T
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> T
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> T
-    3:3:boolean canUseNativeDexPcInsteadOfDebugInfo():2076 -> T
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> T
-    4:4:boolean canUseNativeDexPcInsteadOfDebugInfo():2076 -> T
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2067:2067 -> T
-    5:5:boolean canUseNativeDexPcInsteadOfDebugInfo():2077 -> T
-    1:32:boolean printWarnings():1187:1218 -> T0
-    33:72:boolean printWarnings():1214:1253 -> T0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> U
-    1:1:boolean canUseNotInstruction():2183 -> U
-    2:2:boolean canUseNotInstruction():2183:2183 -> U
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> U
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> U
-    3:3:boolean canUseNotInstruction():2183 -> U
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> U
-    4:4:boolean canUseNotInstruction():2183 -> U
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():828:828 -> U0
-    1:1:boolean canUsePrivateInterfaceMethods():2060:2060 -> V
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> V
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> V
-    2:2:boolean canUsePrivateInterfaceMethods():2060 -> V
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> V
-    3:3:boolean canUsePrivateInterfaceMethods():2060 -> V
-    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1997:1997 -> V0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> V0
-    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1997 -> V0
-    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1997:1998 -> V0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> W
-    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():2157 -> W
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> W
-    2:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():2157 -> W
-    3:3:boolean canUseSameArrayAndResultRegisterInArrayGetWide():2157:2157 -> W
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():462:462 -> W0
-    1:1:boolean shouldBackportMethods():502 -> W0
-    2:2:boolean shouldBackportMethods():502:502 -> W0
-    1:1:boolean canUseSuppressedExceptions():2113:2113 -> X
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> X
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> X
-    2:2:boolean canUseSuppressedExceptions():2113 -> X
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> X
-    3:3:boolean canUseSuppressedExceptions():2113 -> X
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():2026:2026 -> X0
-    1:1:boolean shouldDesugarNests():571 -> X0
-    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():816:816 -> Y
-    1:1:boolean shouldDesugarRecords():575:575 -> Y0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():2030:2030 -> Y0
-    2:2:boolean shouldDesugarRecords():575 -> Y0
-    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():840:840 -> Z
-    1:1:boolean shouldKeepStackMapTable():506:506 -> Z0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():498:498 -> Z0
-    2:2:boolean shouldKeepStackMapTable():506 -> Z0
-    3:4:boolean shouldKeepStackMapTable():506:507 -> Z0
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():498:498 -> Z0
-    5:5:boolean shouldKeepStackMapTable():508 -> Z0
-    6:6:boolean shouldKeepStackMapTable():509:509 -> Z0
-    1:1:int access$000(java.lang.String,int):0:0 -> a
-    2:5:int com.android.tools.r8.utils.InternalOptions.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,int):896:899 -> a
-    2:5:int access$000(java.lang.String,int):113 -> a
+    4:4:boolean isRepackagingEnabled():685:685 -> K0
+    1:1:boolean canUseInputStackMaps():767:767 -> L
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> L
+    2:2:boolean canUseInputStackMaps():767 -> L
+    1:3:boolean isShrinking():652:652 -> L0
+    5:5:boolean isShrinking():654:654 -> L0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> M
+    1:1:boolean canUseInvokeCustom():1994 -> M
+    2:2:boolean canUseInvokeCustom():1994:1994 -> M
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> M
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> M
+    3:3:boolean canUseInvokeCustom():1994 -> M
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> M
+    4:4:boolean canUseInvokeCustom():1994 -> M
+    1:1:boolean isStringSwitchConversionEnabled():2075:2075 -> M0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> N
+    1:1:boolean canUseInvokePolymorphic():1982 -> N
+    2:2:boolean canUseInvokePolymorphic():1982:1982 -> N
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> N
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> N
+    3:3:boolean canUseInvokePolymorphic():1982 -> N
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> N
+    4:4:boolean canUseInvokePolymorphic():1982 -> N
+    1:6:void keepDebugRelatedInformation():224:229 -> N0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> O
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1978 -> O
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1978:1978 -> O
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> O
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> O
+    3:3:boolean canUseInvokePolymorphicOnVarHandle():1978 -> O
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> O
+    4:4:boolean canUseInvokePolymorphicOnVarHandle():1978 -> O
+    1:2:boolean keepInnerClassStructure():762:763 -> O0
+    1:1:boolean canUseJavaUtilObjects():2084:2084 -> P
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> P
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> P
+    2:2:boolean canUseJavaUtilObjects():2084 -> P
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> P
+    3:3:boolean canUseJavaUtilObjects():2084 -> P
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():837:837 -> P0
+    1:1:boolean canUseJavaUtilObjectsIsNull():2088:2088 -> Q
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> Q
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> Q
+    2:2:boolean canUseJavaUtilObjectsIsNull():2088 -> Q
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> Q
+    3:3:boolean canUseJavaUtilObjectsIsNull():2088 -> Q
+    1:1:boolean parseSignatureAttribute():694:694 -> Q0
+    1:2:boolean canUseMultidex():2079:2080 -> R
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> R
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> R
+    3:3:boolean canUseMultidex():2080 -> R
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> R
+    4:4:boolean canUseMultidex():2080 -> R
+    1:32:boolean printWarnings():1163:1194 -> R0
+    33:72:boolean printWarnings():1190:1229 -> R0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPc2PcAsDebugInformation():2051:2051 -> S
+    1:1:boolean canUseNativeDexPcInsteadOfDebugInfo():2055 -> S
+    2:2:boolean canUseNativeDexPcInsteadOfDebugInfo():2055:2055 -> S
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> S
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> S
+    3:3:boolean canUseNativeDexPcInsteadOfDebugInfo():2056 -> S
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> S
+    4:4:boolean canUseNativeDexPcInsteadOfDebugInfo():2056 -> S
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2047:2047 -> S
+    5:5:boolean canUseNativeDexPcInsteadOfDebugInfo():2057 -> S
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():833:833 -> S0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> T
+    1:1:boolean canUseNotInstruction():2163 -> T
+    2:2:boolean canUseNotInstruction():2163:2163 -> T
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> T
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> T
+    3:3:boolean canUseNotInstruction():2163 -> T
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> T
+    4:4:boolean canUseNotInstruction():2163 -> T
+    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1973:1973 -> T0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> T0
+    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1973 -> T0
+    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1973:1974 -> T0
+    1:1:boolean canUsePrivateInterfaceMethods():2040:2040 -> U
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> U
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> U
+    2:2:boolean canUsePrivateInterfaceMethods():2040 -> U
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> U
+    3:3:boolean canUsePrivateInterfaceMethods():2040 -> U
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():467:467 -> U0
+    1:1:boolean shouldBackportMethods():507 -> U0
+    2:2:boolean shouldBackportMethods():507:507 -> U0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> V
+    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():2137 -> V
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> V
+    2:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():2137 -> V
+    3:3:boolean canUseSameArrayAndResultRegisterInArrayGetWide():2137:2137 -> V
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():2002:2002 -> V0
+    1:1:boolean shouldDesugarNests():576 -> V0
+    1:1:boolean canUseSuppressedExceptions():2093:2093 -> W
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> W
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> W
+    2:2:boolean canUseSuppressedExceptions():2093 -> W
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> W
+    3:3:boolean canUseSuppressedExceptions():2093 -> W
+    1:1:boolean shouldDesugarRecords():580:580 -> W0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():2006:2006 -> W0
+    2:2:boolean shouldDesugarRecords():580 -> W0
+    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():821:821 -> X
+    1:1:boolean shouldKeepStackMapTable():511:511 -> X0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():503:503 -> X0
+    2:2:boolean shouldKeepStackMapTable():511 -> X0
+    3:4:boolean shouldKeepStackMapTable():511:512 -> X0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():503:503 -> X0
+    5:5:boolean shouldKeepStackMapTable():513 -> X0
+    6:6:boolean shouldKeepStackMapTable():514:514 -> X0
+    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():845:845 -> Y
+    1:1:boolean shouldRerunEnqueuer():518:518 -> Y0
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():151:151 -> Z
+    1:18:void signalFinishedToConsumers():554:571 -> Z0
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    6:6:com.android.tools.r8.utils.InternalOptions$InlinerOptions access$100(com.android.tools.r8.utils.InternalOptions):113:113 -> a
-    7:8:void setMarker(com.android.tools.r8.dex.Marker):406:407 -> a
-    9:10:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):411:412 -> a
-    11:17:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):419:425 -> a
-    11:17:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):414 -> a
-    18:18:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    18:18:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):426 -> a
-    18:18:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):414 -> a
-    19:24:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):426:431 -> a
-    19:24:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):414 -> a
-    25:25:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> a
-    25:25:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):432 -> a
-    25:25:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):414 -> a
-    26:35:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):432:441 -> a
-    26:35:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):414 -> a
-    36:45:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):448:457 -> a
-    46:46:void setGlobalSyntheticsConsumer(com.android.tools.r8.GlobalSyntheticsConsumer):486:486 -> a
-    47:48:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):634:635 -> a
-    49:58:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):732:741 -> a
-    59:60:boolean isSystemPropertyForDevelopmentSet(java.lang.String):877:878 -> a
-    61:64:void setDesugaredLibrarySpecification(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification):967:970 -> a
-    65:65:void lambda$setDesugaredLibrarySpecification$1(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication):973:973 -> a
-    66:71:void loadMachineDesugaredLibrarySpecification(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication):981:986 -> a
-    72:74:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1059:1061 -> a
-    75:75:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
-    75:75:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1061 -> a
+    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions access$000(com.android.tools.r8.utils.InternalOptions):114:114 -> a
+    2:3:void setMarker(com.android.tools.r8.dex.Marker):411:412 -> a
+    4:5:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):416:417 -> a
+    6:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):424:430 -> a
+    6:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):419 -> a
+    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    13:13:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):431 -> a
+    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):419 -> a
+    14:19:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):431:436 -> a
+    14:19:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):419 -> a
+    20:20:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> a
+    20:20:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):437 -> a
+    20:20:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):419 -> a
+    21:30:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):437:446 -> a
+    21:30:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):419 -> a
+    31:40:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):453:462 -> a
+    41:41:void setGlobalSyntheticsConsumer(com.android.tools.r8.GlobalSyntheticsConsumer):491:491 -> a
+    42:43:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):639:640 -> a
+    44:53:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):737:746 -> a
+    54:54:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():841:841 -> a
+    55:58:void setDesugaredLibrarySpecification(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification):943:946 -> a
+    59:59:void lambda$setDesugaredLibrarySpecification$1(com.android.tools.r8.ir.desugar.desugaredlibrary.DesugaredLibrarySpecification,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication):949:949 -> a
+    60:65:void loadMachineDesugaredLibrarySpecification(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication):957:962 -> a
+    66:68:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1035:1037 -> a
+    69:69:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
+    69:69:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1037 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    76:76:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1061:1061 -> a
-    77:77:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1059:1059 -> a
-    78:84: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):1103:1109 -> a
-    85:85: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):1104:1104 -> a
-    86:87:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1116:1117 -> a
-    88:88:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
-    88:88:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1119 -> a
+    70:70:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1037:1037 -> a
+    71:71:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):1035:1035 -> a
+    72:78: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):1079:1085 -> a
+    79:79: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):1080:1080 -> a
+    80:81:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1092:1093 -> a
+    82:82:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
+    82:82:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1095 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    89:95:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1119:1125 -> a
-    96:96:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1117:1117 -> a
-    97:105:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1145:1153 -> a
-    106:106:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1152:1152 -> a
-    107:107:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1146:1146 -> a
-    108:108:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$2(com.android.tools.r8.graph.DexMethod):1153:1153 -> a
-    109:112:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1158:1161 -> a
-    113:117:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1166:1170 -> a
-    118:124:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1175:1181 -> a
-    125:125:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1176:1176 -> a
-    126:126:java.util.List lambda$warningInvalidDebugInfo$5(com.android.tools.r8.origin.Origin):1180:1180 -> a
-    127:132:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1267:1272 -> a
-    133:133:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1992:1992 -> a
-    134:134:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    134:134:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1992 -> a
-    135:136:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1992:1993 -> a
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():150:150 -> a0
-    1:1:boolean shouldRerunEnqueuer():513:513 -> a1
-    1:1:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():836:836 -> b
-    2:9:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1065:1072 -> b
-    10:16:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1069:1075 -> b
-    17:41:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1074:1098 -> b
-    42:42:java.util.List lambda$warningInvalidParameterAnnotations$4(com.android.tools.r8.origin.Origin):1169:1169 -> b
-    1:3:void disableAllOptimizations():241:243 -> b0
-    1:18:void signalFinishedToConsumers():549:566 -> b1
-    1:1:boolean assertionsEnabled():1026:1026 -> c
-    2:2:java.util.List lambda$warningMissingEnclosingMember$3(com.android.tools.r8.origin.Origin):1160:1160 -> c
-    1:12:void disableGlobalOptimizations():247:258 -> c0
-    1:2:void warningReadingKotlinMetadataReflective():1130:1131 -> c1
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():812:812 -> d
-    1:1:void disableNameReflectionOptimization():1959:1959 -> d0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> e
-    1:1:boolean canHaveArtCheckCastVerifierBug():2432 -> e
-    2:2:boolean canHaveArtCheckCastVerifierBug():2432:2432 -> e
-    1:1:boolean enableBackportedMethodRewriting():2046:2046 -> e0
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> e0
-    2:2:boolean enableBackportedMethodRewriting():2046 -> e0
-    3:3:boolean enableBackportedMethodRewriting():2046:2046 -> e0
-    1:1:boolean canHaveArtInstanceOfVerifierBug():2388:2388 -> f
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> f
-    2:2:boolean canHaveArtInstanceOfVerifierBug():2388 -> f
-    3:3:boolean canHaveArtInstanceOfVerifierBug():2388:2388 -> f
-    1:6:void enableProtoShrinking():232:237 -> f0
-    1:1:boolean canHaveArtStringNewInitBug():2313:2313 -> g
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> g
-    2:2:boolean canHaveArtStringNewInitBug():2313 -> g
-    3:3:boolean canHaveArtStringNewInitBug():2313:2313 -> g
-    1:5:boolean enableTryWithResourcesDesugaring():2050:2054 -> g0
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():2038:2038 -> g0
-    6:6:boolean enableTryWithResourcesDesugaring():2054 -> g0
-    7:7:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> g0
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963 -> g0
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():2038 -> g0
-    7:7:boolean enableTryWithResourcesDesugaring():2054 -> g0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1963:1963 -> g0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():2038 -> g0
-    8:8:boolean enableTryWithResourcesDesugaring():2054 -> g0
-    9:9:boolean enableTryWithResourcesDesugaring():2056:2056 -> g0
-    1:1:boolean canHaveBoundsCheckEliminationBug():2174:2174 -> h
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> h
-    2:2:boolean canHaveBoundsCheckEliminationBug():2174 -> h
-    3:3:boolean canHaveBoundsCheckEliminationBug():2174:2174 -> h
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():865:873 -> h0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> i
-    1:1:boolean canHaveCmpIfFloatBug():2266 -> i
-    2:2:boolean canHaveCmpIfFloatBug():2266:2266 -> i
-    1:9:java.util.Set getExtensiveLoggingFilter():852:860 -> i0
-    1:1:boolean canHaveCmpLongBug():2238:2238 -> j
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> j
-    2:2:boolean canHaveCmpLongBug():2238 -> j
-    3:3:boolean canHaveCmpLongBug():2238:2238 -> j
-    1:1:com.android.tools.r8.GlobalSyntheticsConsumer getGlobalSyntheticsConsumer():482:482 -> j0
-    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2464:2464 -> k
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> k
-    2:2:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2464 -> k
-    3:3:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2464:2464 -> k
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():466:466 -> k0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():462:462 -> k0
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():466 -> k0
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():466:466 -> k0
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():521:521 -> k0
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():467 -> k0
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():468:468 -> k0
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():525:525 -> k0
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():469 -> k0
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():470:470 -> k0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> k0
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():471 -> k0
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():472:474 -> k0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> l
-    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():2456 -> l
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> l
-    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():2456 -> l
-    3:3:boolean canHaveDalvikCatchHandlerVerificationBug():2456:2456 -> l
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():630:630 -> l0
-    1:1:boolean canHaveDalvikEmptyAnnotationSetBug():2531:2531 -> m
-    1:1:com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions getOpenClosedInterfacesOptions():844:844 -> m0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> n
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2478 -> n
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> n
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2478 -> n
-    3:3:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2478:2478 -> n
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():158:158 -> n0
-    1:1:boolean canHaveDex2OatInliningIssue():2305:2305 -> o
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> o
-    2:2:boolean canHaveDex2OatInliningIssue():2305 -> o
-    3:3:boolean canHaveDex2OatInliningIssue():2305:2305 -> o
-    1:1:com.android.tools.r8.experimental.startup.StartupOptions getStartupOptions():848:848 -> o0
-    1:1:boolean canHaveDex2OatLinkedListBug():2297:2297 -> p
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> p
-    2:2:boolean canHaveDex2OatLinkedListBug():2297 -> p
-    3:3:boolean canHaveDex2OatLinkedListBug():2297:2297 -> p
-    1:887:java.lang.String getSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String):0:886 -> p0
-    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():2346:2346 -> q
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> q
-    2:2:boolean canHaveExceptionTargetingLoopHeaderBug():2346 -> q
-    3:3:boolean canHaveExceptionTargetingLoopHeaderBug():2346:2346 -> q
-    1:2:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():994:995 -> q0
-    3:3:com.android.tools.r8.ir.desugar.TypeRewriter com.android.tools.r8.ir.desugar.TypeRewriter.empty():18:18 -> q0
-    3:3:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():996 -> q0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> r
-    1:1:boolean canHaveExceptionTypeBug():2424 -> r
-    2:2:boolean canHaveExceptionTypeBug():2424:2424 -> r
-    1:1:boolean hasGlobalSyntheticsConsumer():478:478 -> r0
-    1:1:boolean canHaveForwardingInitInliningBug():2334:2334 -> s
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> s
-    2:2:boolean canHaveForwardingInitInliningBug():2334 -> s
-    3:3:boolean canHaveForwardingInitInliningBug():2334:2334 -> s
-    1:1:boolean hasMethodsFilter():1262:1262 -> s0
-    1:1:boolean canHaveInvokeInterfaceToObjectMethodBug():2525:2525 -> t
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> t
-    2:2:boolean canHaveInvokeInterfaceToObjectMethodBug():2525 -> t
-    3:3:boolean canHaveInvokeInterfaceToObjectMethodBug():2525:2525 -> t
-    1:1:boolean hasProguardConfiguration():154:154 -> t0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> u
-    1:1:boolean canHaveLongToIntBug():2411 -> u
-    2:2:boolean canHaveLongToIntBug():2411:2411 -> u
-    1:1:boolean hasUsageInformationConsumer():955:955 -> u0
-    1:1:boolean canHaveMul2AddrBug():2288:2288 -> v
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> v
-    2:2:boolean canHaveMul2AddrBug():2288 -> v
-    3:3:boolean canHaveMul2AddrBug():2288:2288 -> v
-    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():824:824 -> v0
-    1:1:boolean canHaveNumberConversionRegisterAllocationBug():2321:2321 -> w
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> w
-    2:2:boolean canHaveNumberConversionRegisterAllocationBug():2321 -> w
-    3:3:boolean canHaveNumberConversionRegisterAllocationBug():2321:2321 -> w
-    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():820:820 -> w0
-    1:1:boolean canHaveOverlappingLongRegisterBug():2205:2205 -> x
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> x
-    2:2:boolean canHaveOverlappingLongRegisterBug():2205 -> x
-    3:3:boolean canHaveOverlappingLongRegisterBug():2205:2205 -> x
-    1:1:boolean isDesugaredLibraryCompilation():494:494 -> x0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> y
-    1:1:boolean canHaveSuperInvokeBug():2509 -> y
-    2:2:boolean canHaveSuperInvokeBug():2509:2509 -> y
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> y0
-    1:1:boolean isDesugaring():533 -> y0
-    2:2:boolean isDesugaring():533:533 -> y0
-    1:1:boolean canHaveSwitchMaxIntBug():2493:2493 -> z
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():630:630 -> z
-    2:2:boolean canHaveSwitchMaxIntBug():2493 -> z
-    3:3:boolean canHaveSwitchMaxIntBug():2493:2493 -> z
-    1:1:boolean isGeneratingClassFiles():529:529 -> z0
-com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.Dv:
+    83:89:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1095:1101 -> a
+    90:90:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1093:1093 -> a
+    91:99:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1121:1129 -> a
+    100:100:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1128:1128 -> a
+    101:101:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):1122:1122 -> a
+    102:102:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$2(com.android.tools.r8.graph.DexMethod):1129:1129 -> a
+    103:106:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1134:1137 -> a
+    107:111:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1142:1146 -> a
+    112:118:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1151:1157 -> a
+    119:119:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1152:1152 -> a
+    120:120:java.util.List lambda$warningInvalidDebugInfo$5(com.android.tools.r8.origin.Origin):1156:1156 -> a
+    121:126:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1243:1248 -> a
+    127:127:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1968:1968 -> a
+    128:128:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    128:128:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1968 -> a
+    129:130:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1968:1969 -> a
+    1:3:void disableAllOptimizations():242:244 -> a0
+    1:2:void warningReadingKotlinMetadataReflective():1106:1107 -> a1
+    1:1:boolean assertionsEnabled():1002:1002 -> b
+    2:9:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1041:1048 -> b
+    10:16:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1045:1051 -> b
+    17:41:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):1050:1074 -> b
+    42:42:java.util.List lambda$warningInvalidParameterAnnotations$4(com.android.tools.r8.origin.Origin):1145:1145 -> b
+    1:12:void disableGlobalOptimizations():248:259 -> b0
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():817:817 -> c
+    2:2:java.util.List lambda$warningMissingEnclosingMember$3(com.android.tools.r8.origin.Origin):1136:1136 -> c
+    1:1:void disableNameReflectionOptimization():1935:1935 -> c0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> d
+    1:1:boolean canHaveArtCheckCastVerifierBug():2412 -> d
+    2:2:boolean canHaveArtCheckCastVerifierBug():2412:2412 -> d
+    1:1:boolean enableBackportedMethodRewriting():2026:2026 -> d0
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> d0
+    2:2:boolean enableBackportedMethodRewriting():2026 -> d0
+    3:3:boolean enableBackportedMethodRewriting():2026:2026 -> d0
+    1:1:boolean canHaveArtInstanceOfVerifierBug():2368:2368 -> e
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> e
+    2:2:boolean canHaveArtInstanceOfVerifierBug():2368 -> e
+    3:3:boolean canHaveArtInstanceOfVerifierBug():2368:2368 -> e
+    1:6:void enableProtoShrinking():233:238 -> e0
+    1:1:boolean canHaveArtStringNewInitBug():2293:2293 -> f
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> f
+    2:2:boolean canHaveArtStringNewInitBug():2293 -> f
+    3:3:boolean canHaveArtStringNewInitBug():2293:2293 -> f
+    1:5:boolean enableTryWithResourcesDesugaring():2030:2034 -> f0
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():2018:2018 -> f0
+    6:6:boolean enableTryWithResourcesDesugaring():2034 -> f0
+    7:7:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> f0
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939 -> f0
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():2018 -> f0
+    7:7:boolean enableTryWithResourcesDesugaring():2034 -> f0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1939:1939 -> f0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():2018 -> f0
+    8:8:boolean enableTryWithResourcesDesugaring():2034 -> f0
+    9:9:boolean enableTryWithResourcesDesugaring():2036:2036 -> f0
+    1:1:boolean canHaveBoundsCheckEliminationBug():2154:2154 -> g
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> g
+    2:2:boolean canHaveBoundsCheckEliminationBug():2154 -> g
+    3:3:boolean canHaveBoundsCheckEliminationBug():2154:2154 -> g
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():870:878 -> g0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> h
+    1:1:boolean canHaveCmpIfFloatBug():2246 -> h
+    2:2:boolean canHaveCmpIfFloatBug():2246:2246 -> h
+    1:9:java.util.Set getExtensiveLoggingFilter():857:865 -> h0
+    1:1:boolean canHaveCmpLongBug():2218:2218 -> i
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> i
+    2:2:boolean canHaveCmpLongBug():2218 -> i
+    3:3:boolean canHaveCmpLongBug():2218:2218 -> i
+    1:1:com.android.tools.r8.GlobalSyntheticsConsumer getGlobalSyntheticsConsumer():487:487 -> i0
+    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2444:2444 -> j
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> j
+    2:2:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2444 -> j
+    3:3:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2444:2444 -> j
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():471:471 -> j0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():467:467 -> j0
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():471 -> j0
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():471:471 -> j0
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():526:526 -> j0
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():472 -> j0
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():473:473 -> j0
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():530:530 -> j0
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():474 -> j0
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():475:475 -> j0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> j0
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():476 -> j0
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():477:479 -> j0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> k
+    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():2436 -> k
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> k
+    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():2436 -> k
+    3:3:boolean canHaveDalvikCatchHandlerVerificationBug():2436:2436 -> k
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():635:635 -> k0
+    1:1:boolean canHaveDalvikEmptyAnnotationSetBug():2511:2511 -> l
+    1:1:com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions getOpenClosedInterfacesOptions():849:849 -> l0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> m
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2458 -> m
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> m
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2458 -> m
+    3:3:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2458:2458 -> m
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():159:159 -> m0
+    1:1:boolean canHaveDex2OatInliningIssue():2285:2285 -> n
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> n
+    2:2:boolean canHaveDex2OatInliningIssue():2285 -> n
+    3:3:boolean canHaveDex2OatInliningIssue():2285:2285 -> n
+    1:1:com.android.tools.r8.experimental.startup.StartupOptions getStartupOptions():853:853 -> n0
+    1:1:boolean canHaveDex2OatLinkedListBug():2277:2277 -> o
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> o
+    2:2:boolean canHaveDex2OatLinkedListBug():2277 -> o
+    3:3:boolean canHaveDex2OatLinkedListBug():2277:2277 -> o
+    1:2:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():970:971 -> o0
+    3:3:com.android.tools.r8.ir.desugar.TypeRewriter com.android.tools.r8.ir.desugar.TypeRewriter.empty():18:18 -> o0
+    3:3:com.android.tools.r8.ir.desugar.TypeRewriter getTypeRewriter():972 -> o0
+    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():2326:2326 -> p
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> p
+    2:2:boolean canHaveExceptionTargetingLoopHeaderBug():2326 -> p
+    3:3:boolean canHaveExceptionTargetingLoopHeaderBug():2326:2326 -> p
+    1:1:boolean hasGlobalSyntheticsConsumer():483:483 -> p0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> q
+    1:1:boolean canHaveExceptionTypeBug():2404 -> q
+    2:2:boolean canHaveExceptionTypeBug():2404:2404 -> q
+    1:1:boolean hasMethodsFilter():1238:1238 -> q0
+    1:1:boolean canHaveForwardingInitInliningBug():2314:2314 -> r
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> r
+    2:2:boolean canHaveForwardingInitInliningBug():2314 -> r
+    3:3:boolean canHaveForwardingInitInliningBug():2314:2314 -> r
+    1:1:boolean hasProguardConfiguration():155:155 -> r0
+    1:1:boolean canHaveInvokeInterfaceToObjectMethodBug():2505:2505 -> s
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> s
+    2:2:boolean canHaveInvokeInterfaceToObjectMethodBug():2505 -> s
+    3:3:boolean canHaveInvokeInterfaceToObjectMethodBug():2505:2505 -> s
+    1:1:boolean hasUsageInformationConsumer():931:931 -> s0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> t
+    1:1:boolean canHaveLongToIntBug():2391 -> t
+    2:2:boolean canHaveLongToIntBug():2391:2391 -> t
+    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():829:829 -> t0
+    1:1:boolean canHaveMul2AddrBug():2268:2268 -> u
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> u
+    2:2:boolean canHaveMul2AddrBug():2268 -> u
+    3:3:boolean canHaveMul2AddrBug():2268:2268 -> u
+    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():825:825 -> u0
+    1:1:boolean canHaveNumberConversionRegisterAllocationBug():2301:2301 -> v
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> v
+    2:2:boolean canHaveNumberConversionRegisterAllocationBug():2301 -> v
+    3:3:boolean canHaveNumberConversionRegisterAllocationBug():2301:2301 -> v
+    1:1:boolean isDesugaredLibraryCompilation():499:499 -> v0
+    1:1:boolean canHaveOverlappingLongRegisterBug():2185:2185 -> w
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> w
+    2:2:boolean canHaveOverlappingLongRegisterBug():2185 -> w
+    3:3:boolean canHaveOverlappingLongRegisterBug():2185:2185 -> w
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> w0
+    1:1:boolean isDesugaring():538 -> w0
+    2:2:boolean isDesugaring():538:538 -> w0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> x
+    1:1:boolean canHaveSuperInvokeBug():2489 -> x
+    2:2:boolean canHaveSuperInvokeBug():2489:2489 -> x
+    1:1:boolean isGeneratingClassFiles():534:534 -> x0
+    1:1:boolean canHaveSwitchMaxIntBug():2473:2473 -> y
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> y
+    2:2:boolean canHaveSwitchMaxIntBug():2473 -> y
+    3:3:boolean canHaveSwitchMaxIntBug():2473:2473 -> y
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():526:526 -> y0
+    1:1:boolean isGeneratingDex():522 -> y0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():530:530 -> y0
+    2:2:boolean isGeneratingDex():522 -> y0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():635:635 -> z
+    1:1:boolean canHaveThisJitCodeDebuggingBug():2179 -> z
+    2:2:boolean canHaveThisJitCodeDebuggingBug():2179:2179 -> z
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():467:467 -> z0
+    1:1:boolean isInterfaceMethodDesugaringEnabled():2062 -> z0
+    2:4:boolean isInterfaceMethodDesugaringEnabled():2065:2067 -> z0
+com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.Jv:
     int[] $SwitchMap$com$android$tools$r8$utils$OffOrAuto -> a
-    1:1:void <clinit>():2050:2050 -> <clinit>
-com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.Ev$a:
+    1:1:void <clinit>():2030:2030 -> <clinit>
+com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.Kv$a:
     java.util.function.BiConsumer tracedMethodApiLevelCallback -> h
     boolean enableApiCallerIdentification -> a
     java.util.Map methodApiMapping -> e
@@ -128434,59 +129524,59 @@
     boolean enableStubbingOfClasses -> c
     java.util.Map classApiMapping -> g
     boolean enableOutliningOfMethods -> d
-    1:19:void <init>():1642:1660 -> <init>
-    1:12:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):1664:1675 -> a
-    13:13:void lambda$visitMockedApiLevelsForReferences$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference,com.android.tools.r8.utils.AndroidApiLevel):1669:1669 -> a
-    14:14:void lambda$visitMockedApiLevelsForReferences$1(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.FieldReference,com.android.tools.r8.utils.AndroidApiLevel):1673:1673 -> a
-    15:15:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.MethodReference,com.android.tools.r8.utils.AndroidApiLevel):1677:1677 -> a
-    16:16:void disableApiCallerIdentification():1691:1691 -> a
-com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.Ev$b:
+    1:19:void <init>():1618:1636 -> <init>
+    1:12:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.BiConsumer):1640:1651 -> a
+    13:13:void lambda$visitMockedApiLevelsForReferences$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference,com.android.tools.r8.utils.AndroidApiLevel):1645:1645 -> a
+    14:14:void lambda$visitMockedApiLevelsForReferences$1(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.FieldReference,com.android.tools.r8.utils.AndroidApiLevel):1649:1649 -> a
+    15:15:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.MethodReference,com.android.tools.r8.utils.AndroidApiLevel):1653:1653 -> a
+    16:16:void disableApiCallerIdentification():1667:1667 -> a
+com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.Kv$b:
     com.android.tools.r8.utils.InternalOptions this$0 -> d
     boolean $assertionsDisabled -> e
     boolean enabled -> a
     boolean enableMethodStaticizing -> b
     boolean forceSyntheticsForInstanceInitializers -> c
-    1:1:void <clinit>():1349:1349 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):1349:1354 -> <init>
-    1:1:void disableOptimization():1357:1357 -> a
-    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnableMethodStaticizing(boolean):1395:1395 -> a
-    1:4:boolean isEnabled():1365:1368 -> b
-    5:5:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1381:1381 -> b
-    6:6:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1357:1357 -> b
-    6:6:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1383 -> b
-    1:1:boolean isForceSyntheticsForInstanceInitializersEnabled():1372:1372 -> c
-    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setForceSyntheticsForInstanceInitializers(boolean):1390:1390 -> c
-    1:1:boolean isMethodStaticizingEnabled():1376:1376 -> d
-com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions -> com.android.tools.r8.internal.Ev$c:
+    1:1:void <clinit>():1325:1325 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):1325:1330 -> <init>
+    1:1:void disableOptimization():1333:1333 -> a
+    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnableMethodStaticizing(boolean):1371:1371 -> a
+    1:4:boolean isEnabled():1341:1344 -> b
+    5:5:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1357:1357 -> b
+    6:6:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1333:1333 -> b
+    6:6:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1359 -> b
+    1:1:boolean isForceSyntheticsForInstanceInitializersEnabled():1348:1348 -> c
+    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setForceSyntheticsForInstanceInitializers(boolean):1366:1366 -> c
+    1:1:boolean isMethodStaticizingEnabled():1352:1352 -> d
+com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions -> com.android.tools.r8.internal.Kv$c:
     com.android.tools.r8.utils.InternalOptions this$0 -> b
     boolean $assertionsDisabled -> c
     int classInliningInstructionAllowance -> a
-    1:1:void <clinit>():1400:1400 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1400:1402 -> <init>
-    1:4:int getClassInliningInstructionAllowance():1405:1408 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    5:5:int getClassInliningInstructionAllowance():1408 -> a
+    1:1:void <clinit>():1376:1376 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1376:1378 -> <init>
+    1:4:int getClassInliningInstructionAllowance():1381:1384 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    5:5:int getClassInliningInstructionAllowance():1384 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    6:6:int getClassInliningInstructionAllowance():1408 -> a
-    7:7:int getClassInliningInstructionAllowance():1411:1411 -> a
-com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.Ev$d:
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    6:6:int getClassInliningInstructionAllowance():1384 -> a
+    7:7:int getClassInliningInstructionAllowance():1387:1387 -> a
+com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.Kv$d:
     boolean sortMethodsOnCfOutput -> a
     boolean allowAllDesugaredInput -> b
     boolean noCfMarkerForDesugaredCode -> c
     boolean lambdaClassFieldsFinal -> d
-    1:15:void <init>():1332:1346 -> <init>
-com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.Ev$e:
+    1:15:void <init>():1308:1322 -> <init>
+com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.Kv$e:
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> c
     com.android.tools.r8.utils.InternalOptions$DesugarState[] $VALUES -> d
-    1:2:void <clinit>():128:129 -> <clinit>
-    3:3:void <clinit>():127:127 -> <clinit>
-    1:1:void <init>(java.lang.String,int):127:127 -> <init>
-    1:1:boolean isOff():132:132 -> a
-    1:1:boolean isOn():136:136 -> b
-    1:1:com.android.tools.r8.utils.InternalOptions$DesugarState[] values():127:127 -> values
-com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.Ev$f:
+    1:2:void <clinit>():129:130 -> <clinit>
+    3:3:void <clinit>():128:128 -> <clinit>
+    1:1:void <init>(java.lang.String,int):128:128 -> <init>
+    1:1:boolean isOff():133:133 -> a
+    1:1:boolean isOn():137:137 -> b
+    1:1:com.android.tools.r8.utils.InternalOptions$DesugarState[] values():128:128 -> values
+com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions -> com.android.tools.r8.internal.Kv$f:
     boolean enableSyntheticMerging -> e
     boolean restrictToSynthetics -> f
     com.android.tools.r8.utils.InternalOptions this$0 -> g
@@ -128495,23 +129585,23 @@
     boolean enableClassInitializerDeadlockDetection -> b
     boolean enableInterfaceMerging -> c
     boolean enableInterfaceMergingInInitial -> d
-    1:1:void <clinit>():1465:1465 -> <clinit>
-    1:14:void <init>(com.android.tools.r8.utils.InternalOptions):1465:1478 -> <init>
-    1:1:void disable():1481:1481 -> a
-    2:2:void enableIf(boolean):1493:1493 -> a
-    3:9:boolean isEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1517:1523 -> a
-    1:1:void disableSyntheticMerging():1485:1485 -> b
-    2:8:boolean isInterfaceMergingEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1536:1542 -> b
-    1:1:void enable():1489:1489 -> c
+    1:1:void <clinit>():1441:1441 -> <clinit>
+    1:14:void <init>(com.android.tools.r8.utils.InternalOptions):1441:1454 -> <init>
+    1:1:void disable():1457:1457 -> a
+    2:2:void enableIf(boolean):1469:1469 -> a
+    3:9:boolean isEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1493:1499 -> a
+    1:1:void disableSyntheticMerging():1461:1461 -> b
+    2:8:boolean isInterfaceMergingEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1512:1518 -> b
+    1:1:void enable():1465:1465 -> c
     int getMaxClassGroupSizeInR8() -> d
-    1:1:boolean isClassInitializerDeadlockDetectionEnabled():1513:1513 -> e
-    1:1:boolean isRestrictedToSynthetics():1547:1547 -> f
-    1:1:boolean isSyntheticMergingEnabled():1532:1532 -> g
-    1:1:void setEnableClassInitializerDeadlockDetection():1551:1551 -> h
-    1:1:void setEnableInterfaceMerging():1555:1555 -> i
-    1:1:void setEnableInterfaceMergingInInitial():1559:1559 -> j
-    1:1:void setRestrictToSynthetics():1567:1567 -> k
-com.android.tools.r8.utils.InternalOptions$InlinerOptions -> com.android.tools.r8.internal.Ev$g:
+    1:1:boolean isClassInitializerDeadlockDetectionEnabled():1489:1489 -> e
+    1:1:boolean isRestrictedToSynthetics():1523:1523 -> f
+    1:1:boolean isSyntheticMergingEnabled():1508:1508 -> g
+    1:1:void setEnableClassInitializerDeadlockDetection():1527:1527 -> h
+    1:1:void setEnableInterfaceMerging():1531:1531 -> i
+    1:1:void setEnableInterfaceMergingInInitial():1535:1535 -> j
+    1:1:void setRestrictToSynthetics():1543:1543 -> k
+com.android.tools.r8.utils.InternalOptions$InlinerOptions -> com.android.tools.r8.internal.Kv$g:
     boolean $assertionsDisabled -> m
     boolean enableInliningOfInvokesWithClassInitializationSideEffects -> i
     boolean enableInliningOfInvokesWithNullableReceivers -> j
@@ -128525,73 +129615,73 @@
     int[] multiCallerInliningInstructionLimits -> c
     boolean applyInliningToInlinee -> g
     boolean enableInlining -> a
-    1:1:void <clinit>():1416:1416 -> <clinit>
-    1:33:void <init>(com.android.tools.r8.utils.InternalOptions):1416:1448 -> <init>
-    1:5:int getSimpleInliningInstructionLimit():1452:1456 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    6:6:int getSimpleInliningInstructionLimit():1456 -> a
+    1:1:void <clinit>():1392:1392 -> <clinit>
+    1:33:void <init>(com.android.tools.r8.utils.InternalOptions):1392:1424 -> <init>
+    1:5:int getSimpleInliningInstructionLimit():1428:1432 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    6:6:int getSimpleInliningInstructionLimit():1432 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    7:7:int getSimpleInliningInstructionLimit():1456 -> a
-    8:8:int getSimpleInliningInstructionLimit():1460:1460 -> a
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.Fv:
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    7:7:int getSimpleInliningInstructionLimit():1432 -> a
+    8:8:int getSimpleInliningInstructionLimit():1436:1436 -> a
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.Lv:
     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):912:915 -> <init>
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.Gv:
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):888:891 -> <init>
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.Mv:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():1325:1327 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.Ev$h:
+    1:3:void <init>():1301:1303 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.Kv$h:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> c
-    1:2:void <clinit>():123:124 -> <clinit>
-    1:1:void <init>(java.lang.String,int):122:122 -> <init>
-com.android.tools.r8.utils.InternalOptions$NeverMergeGroup -> com.android.tools.r8.internal.Hv:
+    1:2:void <clinit>():124:125 -> <clinit>
+    1:1:void <init>(java.lang.String,int):123:123 -> <init>
+com.android.tools.r8.utils.InternalOptions$NeverMergeGroup -> com.android.tools.r8.internal.Nv:
     java.util.List exceptionPrefixes -> b
     java.util.List prefixes -> a
-    1:3:void <init>(java.util.List,java.util.List):276:278 -> <init>
-    1:1:java.util.List getExceptionPrefixes():286:286 -> a
-    2:4:com.android.tools.r8.utils.InternalOptions$NeverMergeGroup map(java.util.function.Function):290:292 -> a
-    1:1:java.util.List getPrefixes():282:282 -> b
-com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions -> com.android.tools.r8.internal.Ev$i:
+    1:3:void <init>(java.util.List,java.util.List):277:279 -> <init>
+    1:1:java.util.List getExceptionPrefixes():287:287 -> a
+    2:4:com.android.tools.r8.utils.InternalOptions$NeverMergeGroup map(java.util.function.Function):291:293 -> a
+    1:1:java.util.List getPrefixes():283:283 -> b
+com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions -> com.android.tools.r8.internal.Kv$i:
     java.util.List suppressions -> b
     boolean allowOpenInterfaces -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1571:1571 -> <clinit>
-    1:16:void <init>():1571:1586 -> <init>
+    1:1:void <clinit>():1547:1547 -> <clinit>
+    1:16:void <init>():1547:1562 -> <init>
     boolean lambda$suppressAllOpenInterfaces$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass) -> a
-    1:1:void disallowOpenInterfaces():1589:1589 -> a
-    1:2:void suppressAllOpenInterfaces():1593:1594 -> b
-    3:3:boolean lambda$suppressAllOpenInterfacesDueToMissingClasses$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1600:1600 -> b
-    1:2:void suppressAllOpenInterfacesDueToMissingClasses():1598:1599 -> c
-    3:9:boolean lambda$suppressZipFileAssignmentsToJavaLangAutoCloseable$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1615:1621 -> c
-    1:2:void suppressZipFileAssignmentsToJavaLangAutoCloseable():1612:1613 -> d
-com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions$OpenInterfaceWitnessSuppression -> com.android.tools.r8.internal.Iv:
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.Ev$j:
+    1:1:void disallowOpenInterfaces():1565:1565 -> a
+    1:2:void suppressAllOpenInterfaces():1569:1570 -> b
+    3:3:boolean lambda$suppressAllOpenInterfacesDueToMissingClasses$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1576:1576 -> b
+    1:2:void suppressAllOpenInterfacesDueToMissingClasses():1574:1575 -> c
+    3:9:boolean lambda$suppressZipFileAssignmentsToJavaLangAutoCloseable$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexClass):1591:1597 -> c
+    1:2:void suppressZipFileAssignmentsToJavaLangAutoCloseable():1588:1589 -> d
+com.android.tools.r8.utils.InternalOptions$OpenClosedInterfacesOptions$OpenInterfaceWitnessSuppression -> com.android.tools.r8.internal.Ov:
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.Kv$j:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:5:void <init>():1317:1321 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.Ev$k:
+    1:5:void <init>():1293:1297 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.Kv$k:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> e
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode MINIFICATION -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> b
-    1:8:void <clinit>():1287:1294 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1285:1285 -> <init>
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.Ev$l:
+    1:8:void <clinit>():1263:1270 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1261:1261 -> <init>
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.Kv$l:
     boolean enableEnumLiteProtoShrinking -> e
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:7:void <init>():1699:1705 -> <init>
-    1:1:boolean enableRemoveProtoEnumSwitchMap():1719:1719 -> a
-    1:1:boolean isEnumLiteProtoShrinkingEnabled():1730:1730 -> b
-    1:1:boolean isProtoShrinkingEnabled():1723:1723 -> c
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.Ev$m:
+    1:7:void <init>():1675:1681 -> <init>
+    1:1:boolean enableRemoveProtoEnumSwitchMap():1695:1695 -> a
+    1:1:boolean isEnumLiteProtoShrinkingEnabled():1706:1706 -> b
+    1:1:boolean isProtoShrinkingEnabled():1699:1699 -> c
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.Kv$m:
     java.util.function.BiConsumer horizontallyMergedClassesConsumer -> i
     boolean disableMarkingMethodsFinal -> f0
     boolean verifyInputs -> b0
@@ -128671,30 +129761,30 @@
     boolean enableMultiANewArrayDesugaringForClassFiles -> B
     boolean keepMetadataInR8IfNotRewritten -> i0
     boolean allowConflictingSyntheticTypes -> k0
-    1:213:void <init>():1734:1946 -> <init>
+    1:213:void <init>():1710:1922 -> <init>
     com.android.tools.r8.graph.DexProgramClass lambda$new$0(com.android.tools.r8.graph.AppView,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass) -> a
     void lambda$new$1(java.util.Deque) -> a
-    1:8:com.android.tools.r8.utils.DeterminismChecker com.android.tools.r8.utils.InternalOptions$TestingOptions.getDeterminismChecker():1741:1748 -> a
-    1:8:void checkDeterminism(com.android.tools.r8.graph.AppView):1756 -> a
-    9:9:void checkDeterminism(com.android.tools.r8.graph.AppView):1758:1758 -> a
-    10:17:com.android.tools.r8.utils.DeterminismChecker com.android.tools.r8.utils.InternalOptions$TestingOptions.getDeterminismChecker():1741:1748 -> a
-    10:17:void checkDeterminism(com.android.tools.r8.utils.ThrowingConsumer):1764 -> a
-    18:18:void checkDeterminism(com.android.tools.r8.utils.ThrowingConsumer):1766:1766 -> a
-    19:19:void setDeterminismChecker(com.android.tools.r8.utils.DeterminismChecker):1752:1752 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.Ev$m$a:
+    1:8:com.android.tools.r8.utils.DeterminismChecker com.android.tools.r8.utils.InternalOptions$TestingOptions.getDeterminismChecker():1717:1724 -> a
+    1:8:void checkDeterminism(com.android.tools.r8.graph.AppView):1732 -> a
+    9:9:void checkDeterminism(com.android.tools.r8.graph.AppView):1734:1734 -> a
+    10:17:com.android.tools.r8.utils.DeterminismChecker com.android.tools.r8.utils.InternalOptions$TestingOptions.getDeterminismChecker():1717:1724 -> a
+    10:17:void checkDeterminism(com.android.tools.r8.utils.ThrowingConsumer):1740 -> a
+    18:18:void checkDeterminism(com.android.tools.r8.utils.ThrowingConsumer):1742:1742 -> a
+    19:19:void setDeterminismChecker(com.android.tools.r8.utils.DeterminismChecker):1728:1728 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.Kv$m$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1915:1917 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1921:1922 -> 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):1923:1923 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.Ev$m$b:
+    1:3:void <init>():1891:1893 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1897:1898 -> 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):1899:1899 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.Kv$m$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1933:1936 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.Jv:
+    1:4:void <init>():1909:1912 -> <init>
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.Pv:
     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):924:926 -> <init>
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.Kv:
+    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):900:902 -> <init>
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.Qv:
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> d
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> b
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> c
@@ -128702,7 +129792,7 @@
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean isGeneratingClassFiles():13:13 -> a
     1:1:boolean isGeneratingDex():17:17 -> b
-com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.vw:
+com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.Bw:
     1:7:boolean allIdentical(java.lang.Iterable,java.util.function.Function):27:33 -> a
     8:9:boolean any(java.lang.Iterable,java.util.function.Function,java.util.function.Predicate):43:44 -> a
     10:10:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):92:92 -> a
@@ -128724,7 +129814,7 @@
     1:1:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):92:92 -> d
     2:2:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.filter(java.util.Iterator,java.util.function.Predicate):49:49 -> d
     2:2:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):92 -> d
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Ew:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Kw:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:java.util.Iterator createCircularIterator(java.lang.Iterable):21:22 -> a
@@ -128737,12 +129827,12 @@
     1:3:java.lang.Object nextUntil(java.util.Iterator,java.util.function.Predicate):82:84 -> b
     4:6:java.lang.Object peekPrevious(java.util.ListIterator):92:94 -> b
     7:13:java.lang.Object previousUntil(java.util.ListIterator,java.util.function.Predicate):109:115 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Cw:
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Iw:
     java.util.Iterator iterator -> b
     java.lang.Iterable val$iterable -> c
     1:3:void <init>(java.lang.Iterable):22:24 -> <init>
     1:4:java.lang.Object next():33:36 -> next
-com.android.tools.r8.utils.IteratorUtils$2 -> com.android.tools.r8.internal.Dw:
+com.android.tools.r8.utils.IteratorUtils$2 -> com.android.tools.r8.internal.Jw:
     java.util.Iterator val$iterator -> c
     java.lang.Object next -> b
     java.util.function.Predicate val$predicate -> d
@@ -128751,7 +129841,7 @@
     1:3:java.lang.Object advance():55:57 -> j
     1:5:java.lang.Object next():71:75 -> next
     6:6:java.lang.Object next():73:73 -> next
-com.android.tools.r8.utils.JoiningStringConsumer -> com.android.tools.r8.internal.dx:
+com.android.tools.r8.utils.JoiningStringConsumer -> com.android.tools.r8.internal.jx:
     com.android.tools.r8.StringConsumer consumer -> c
     java.lang.String separator -> b
     java.lang.StringBuilder builder -> d
@@ -128760,23 +129850,23 @@
     1:1:com.android.tools.r8.StringConsumer getConsumer():42:42 -> a
     1:4:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):29:32 -> accept
     1:2:void finished(com.android.tools.r8.DiagnosticsHandler):37:38 -> finished
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.hC:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.nC:
     int rowCapacity -> b
     int columnCapacity -> c
     1:3:void <init>(int,int,float):31:33 -> <init>
     1:1:java.util.Map lambda$put$0(java.lang.Object):46:46 -> a
     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 -> g
+    1:1:com.android.tools.r8.utils.LRUCacheTable create(int,int):37:37 -> h
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.gC:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.mC:
     int columnCapacity -> b
     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.GC:
+com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.MC:
     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.LC:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.RC:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -128787,7 +129877,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.LensUtils -> com.android.tools.r8.internal.XC:
+com.android.tools.r8.utils.LensUtils -> com.android.tools.r8.internal.dD:
     1:1:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.GraphLens.rewriteReference(com.android.tools.r8.graph.DexReference):665:665 -> a
     1:1:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):28 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
@@ -128795,7 +129885,7 @@
     3:3:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     3:3:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):31 -> a
     4:7:void rewriteAndApplyIfNotPrimitiveType(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexReference,java.util.function.Consumer):31:34 -> a
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.YC:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.eD:
     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
@@ -128810,211 +129900,252 @@
     42:42:java.lang.String toString():39:39 -> toString
     43:43:java.lang.String toString():39:39 -> toString
     40:40:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.DD:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.KD:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():89:89 -> <clinit>
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> a
-    1:1:void lambda$getMappedRangesForPosition$11(java.lang.Object):804 -> a
+    1:1:void lambda$getMappedRangesForPosition$13(java.lang.Object):850 -> a
     2:2:com.android.tools.r8.ir.code.Position access$1300(com.android.tools.r8.graph.DexDebugPositionState):89:89 -> a
     3:3:void access$1700(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):89:89 -> a
     4:18:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId runAndWriteMap(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):337:351 -> a
-    19:27:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):475:483 -> a
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2067:2067 -> a
-    28:28:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):483 -> a
+    19:28:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):477:486 -> a
+    29:29:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2047:2047 -> a
+    29:29:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):486 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    29:29:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2067:2067 -> a
-    29:29:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):483 -> a
-    30:34:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):483:487 -> a
-    35:35:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404:404 -> a
-    35:35:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):487 -> a
-    36:36:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):400:400 -> a
-    36:36:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404 -> a
-    36:36:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):487 -> a
-    37:67:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):490:520 -> a
-    68:68:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):519:519 -> a
-    69:71:void com.android.tools.r8.utils.LineNumberOptimizer.addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.LazyBox):892:894 -> a
-    69:71:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):524 -> a
-    72:89:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):527:544 -> a
-    90:90:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):813:813 -> a
-    90:90:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):544 -> a
-    91:91:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    91:91:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):813 -> a
+    30:30:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2047:2047 -> a
+    30:30:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):486 -> a
+    31:35:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):486:490 -> a
+    36:36:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404:404 -> a
+    36:36:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):490 -> a
+    37:37:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexType):400:400 -> a
+    37:37:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):404 -> a
+    37:37:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):490 -> a
+    38:68:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):493:523 -> a
+    69:69:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):522:522 -> a
+    70:72:void com.android.tools.r8.utils.LineNumberOptimizer.addClassToClassNaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.LazyBox):938:940 -> a
+    70:72:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):527 -> a
+    73:90:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):530:547 -> a
+    91:91:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):859:859 -> a
+    91:91:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):547 -> a
+    92:92:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    92:92:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):859 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    91:91:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):544 -> a
-    92:92:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():529:529 -> a
-    92:92:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):813 -> a
-    92:92:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):544 -> a
-    93:108:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):813:828 -> a
-    93:108:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):544 -> a
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():670:670 -> a
-    109:109: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):186 -> a
+    92:92:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):547 -> a
+    93:93:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():534:534 -> a
+    93:93:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):859 -> a
+    93:93:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):547 -> a
+    94:109:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):859:874 -> a
+    94:109:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):547 -> a
+    110:110:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():675:675 -> a
+    110:110: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):186 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    109:109:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):828 -> a
-    109:109:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):544 -> a
-    110:110: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):187:187 -> a
-    110:110:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):828 -> a
-    110:110:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):544 -> a
-    111:127:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):832:848 -> a
-    111:127:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):544 -> a
-    128:149:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):548:569 -> a
-    150:163:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1128:1141 -> a
-    150:163:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):572 -> a
-    164:164:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    164:164:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1141 -> a
+    110:110:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):874 -> a
+    110:110:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):547 -> a
+    111:111: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):187:187 -> a
+    111:111:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):874 -> a
+    111:111:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):547 -> a
+    112:128:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):878:894 -> a
+    112:128:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):547 -> a
+    129:152:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):551:574 -> a
+    153:155:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder,int):1202:1204 -> a
+    153:155:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577 -> a
+    156:157:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo com.android.tools.r8.utils.LineNumberOptimizer.getEventBasedDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.AppView):1157:1158 -> a
+    156:157:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder,int):1205 -> a
+    156:157:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577 -> a
+    158:160:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo com.android.tools.r8.utils.LineNumberOptimizer.createEventBasedInfoForMethodWithoutDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):1169:1171 -> a
+    158:160:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo com.android.tools.r8.utils.LineNumberOptimizer.getEventBasedDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.AppView):1158 -> a
+    158:160:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder,int):1205 -> a
+    158:160:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577 -> a
+    161:164:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo com.android.tools.r8.utils.LineNumberOptimizer.getEventBasedDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.AppView):1160:1163 -> a
+    161:164:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder,int):1205 -> a
+    161:164:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577 -> a
+    165:171:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder,int):1206:1212 -> a
+    165:171:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577 -> a
+    172:172:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    172:172:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder,int):1212 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    164:164:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):572 -> a
-    165:215:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1141:1191 -> a
-    165:215:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):572 -> a
-    216:231:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1188:1203 -> a
-    216:231:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):572 -> a
-    232:235:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder):1202:1205 -> a
-    232:235:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):572 -> a
-    236:236:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577:577 -> a
-    237:250:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):983:996 -> a
-    237:250:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):576 -> a
-    251:251:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    251:251:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):996 -> a
+    172:172:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577 -> a
+    173:210:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder,int):1212:1249 -> a
+    173:210:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577 -> a
+    211:212:com.android.tools.r8.dex.code.DexInstruction com.android.tools.r8.debuginfo.DebugRepresentation.getLastExecutableInstruction(com.android.tools.r8.graph.DexCode):291:292 -> a
+    211:212:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder,int):1257 -> a
+    211:212:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577 -> a
+    213:218:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder,int):1257:1262 -> a
+    213:218:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577 -> a
+    219:233:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder,int):1259:1273 -> a
+    219:233:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577 -> a
+    234:237:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder,int):1272:1275 -> a
+    234:237:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):577 -> a
+    238:238:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):582:582 -> a
+    239:242:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1035:1038 -> a
+    239:242:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    243:244:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo com.android.tools.r8.utils.LineNumberOptimizer.getEventBasedDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.AppView):1157:1158 -> a
+    243:244:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1039 -> a
+    243:244:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    245:247:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo com.android.tools.r8.utils.LineNumberOptimizer.createEventBasedInfoForMethodWithoutDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):1169:1171 -> a
+    245:247:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo com.android.tools.r8.utils.LineNumberOptimizer.getEventBasedDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.AppView):1158 -> a
+    245:247:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1039 -> a
+    245:247:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    248:251:com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo com.android.tools.r8.utils.LineNumberOptimizer.getEventBasedDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.AppView):1160:1163 -> a
+    248:251:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1039 -> a
+    248:251:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    252:257:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1041:1046 -> a
+    252:257:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    258:258:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    258:258:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1046 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    251:251:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):576 -> a
-    252:261:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):996:1005 -> a
-    252:261:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):576 -> a
-    262:262:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    262:262:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1005 -> a
+    258:258:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    259:268:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1046:1055 -> a
+    259:268:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    269:269:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    269:269:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1055 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    262:262:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):576 -> a
-    263:340:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1005:1082 -> a
-    263:340:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):576 -> a
-    341:341:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2067:2067 -> a
-    341:341:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1082 -> a
-    341:341:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):576 -> a
+    269:269:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    270:347:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1055:1132 -> a
+    270:347:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    348:348:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2047:2047 -> a
+    348:348:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1132 -> a
+    348:348:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    342:342:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2067:2067 -> a
-    342:342:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1082 -> a
-    342:342:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):576 -> a
-    343:355:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1083:1095 -> a
-    343:355:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):576 -> a
-    356:359:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo,com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):1212:1215 -> a
-    356:359:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1096 -> a
-    356:359:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):576 -> a
-    360:360:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1098:1098 -> a
-    360:360:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):576 -> a
-    361:362:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):579:580 -> a
-    363:365:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.CfCode):968:970 -> a
-    363:365:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):580 -> a
-    366:366:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581:581 -> a
-    367:379:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1222:1234 -> a
-    367:379:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):582 -> a
-    380:391:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1254:1265 -> a
-    380:391:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1234 -> a
-    380:391:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):582 -> a
-    392:392:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1257:1257 -> a
-    392:392:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1234 -> a
-    392:392:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):582 -> a
-    393:406:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1234:1247 -> a
-    393:406:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):582 -> a
-    407:407:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):174:174 -> a
-    407:407:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1247 -> a
-    407:407:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):582 -> a
-    408:408:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):200:200 -> a
-    408:408:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):174 -> a
-    408:408:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1247 -> a
-    408:408:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):582 -> a
-    409:409:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):192:192 -> a
-    409:409:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):174 -> a
-    409:409:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1247 -> a
-    409:409:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):582 -> a
-    410:410:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1240:1240 -> a
-    410:410:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):582 -> a
-    411:418:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):584:591 -> a
-    419:419:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    419:419:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):591 -> a
+    349:349:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2047:2047 -> a
+    349:349:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1132 -> a
+    349:349:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    350:362:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1133:1145 -> a
+    350:362:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    363:366:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyIdentityMapping(com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo,com.android.tools.r8.graph.DexDebugInfo$EventBasedDebugInfo):1282:1285 -> a
+    363:366:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1146 -> a
+    363:366:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    367:367:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):1148:1148 -> a
+    367:367:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):581 -> a
+    368:369:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):584:585 -> a
+    370:372:boolean com.android.tools.r8.utils.LineNumberOptimizer.mustHaveResidualDebugInfo(com.android.tools.r8.graph.CfCode):1020:1022 -> a
+    370:372:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):585 -> a
+    373:373:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):586:586 -> a
+    374:386:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1292:1304 -> a
+    374:386:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):587 -> a
+    387:398:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1324:1335 -> a
+    387:398:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1304 -> a
+    387:398:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):587 -> a
+    399:399:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1327:1327 -> a
+    399:399:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1304 -> a
+    399:399:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):587 -> a
+    400:413:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1304:1317 -> a
+    400:413:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):587 -> a
+    414:414:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):174:174 -> a
+    414:414:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1317 -> a
+    414:414:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):587 -> a
+    415:415:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):200:200 -> a
+    415:415:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):174 -> a
+    415:415:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1317 -> a
+    415:415:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):587 -> a
+    416:416:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List,com.android.tools.r8.position.Position):192:192 -> a
+    416:416:void com.android.tools.r8.graph.CfCode.<init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):174 -> a
+    416:416:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1317 -> a
+    416:416:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):587 -> a
+    417:417:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeCfCodePositions(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.graph.AppView):1310:1310 -> a
+    417:417:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):587 -> a
+    418:425:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):589:596 -> a
+    426:426:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    426:426:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):596 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    420:439:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):592:611 -> a
-    440:468:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):609:637 -> a
-    469:476:com.android.tools.r8.graph.DexMethod com.android.tools.r8.utils.LineNumberOptimizer.getOutlineMethod(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):762:769 -> a
-    469:476:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):637 -> a
-    477:479:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):639:641 -> a
-    480:480:com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation$Builder.build():56:56 -> a
-    480:480:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):642 -> a
-    481:546:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):642:707 -> a
-    547:585:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):699:737 -> a
-    586:596:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):736:746 -> a
-    597:610:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):745:758 -> a
-    611:612:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):501:502 -> a
-    613:613:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):500:500 -> a
-    614:614:void lambda$run$4(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):625:625 -> a
-    615:615:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$6(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):633:633 -> a
-    616:616:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):634:634 -> a
-    617:631:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.lang.Integer,com.android.tools.r8.ir.code.Position):719:733 -> a
-    632:632:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.lang.Integer,com.android.tools.r8.ir.code.Position):725:725 -> a
-    633:633:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$10(com.android.tools.r8.graph.DexMethod):737:737 -> a
-    634:634:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):784:784 -> a
-    635:647:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):782:794 -> a
-    648:655:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):791:798 -> a
-    656:656:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation.builder():109:109 -> a
-    656:656:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):798 -> a
-    657:660:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):798:801 -> a
-    661:661:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):800:800 -> a
-    662:662:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):799:799 -> a
-    663:663:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction.create(int):269:269 -> a
-    663:663:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):802 -> a
-    664:665:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):802:803 -> a
-    666:675:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.DexItemFactory,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position):797:806 -> a
-    676:689:int getMethodStartLine(com.android.tools.r8.graph.ProgramMethod):854:867 -> a
-    690:690:void sortMethods(java.util.List):876:876 -> a
-    691:695:int lambda$sortMethods$12(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):878:882 -> a
-    696:696:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1199:1199 -> a
-    696:696:int lambda$sortMethods$12(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):882 -> a
-    697:697:void addFieldsToClassNaming(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox):903:903 -> a
-    698:702:void lambda$addFieldsToClassNaming$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):905:909 -> a
-    703:703:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):185:185 -> a
-    703:703:void lambda$addFieldsToClassNaming$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):910 -> a
-    704:704:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
-    704:704:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
-    704:704:void lambda$addFieldsToClassNaming$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):910 -> a
-    705:705:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
-    705:705:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
+    427:445:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):597:615 -> a
+    446:450:boolean com.android.tools.r8.utils.LineNumberOptimizer.hasAtMostOnePosition(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.InternalOptions):786:790 -> a
+    446:450:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):615 -> a
+    451:451:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):616:616 -> a
+    452:480:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):614:642 -> a
+    481:488:com.android.tools.r8.graph.DexMethod com.android.tools.r8.utils.LineNumberOptimizer.getOutlineMethod(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):799:806 -> a
+    481:488:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):642 -> a
+    489:491:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):644:646 -> a
+    492:492:com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation$Builder.build():56:56 -> a
+    492:492:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):647 -> a
+    493:558:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):647:712 -> a
+    559:599:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):704:744 -> a
+    600:610:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):743:753 -> a
+    611:640:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.OriginalSourceFiles,com.android.tools.r8.debuginfo.DebugRepresentation$DebugRepresentationPredicate):752:781 -> a
+    641:642:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):504:505 -> a
+    643:643:com.android.tools.r8.naming.ClassNaming$Builder lambda$run$0(com.android.tools.r8.naming.ClassNameMapper$Builder,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):503:503 -> a
+    644:644:void lambda$run$4(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.naming.mappinginformation.MappingInformation):630:630 -> a
+    645:645:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$6(java.util.Map,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):638:638 -> a
+    646:646:com.android.tools.r8.naming.MemberNaming$MethodSignature lambda$run$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):639:639 -> a
+    647:661:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.util.Map,java.lang.Integer,com.android.tools.r8.ir.code.Position):725:739 -> a
+    662:662:void lambda$run$9(boolean,int,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,java.lang.String,java.util.Map,java.lang.Integer,com.android.tools.r8.ir.code.Position):731:731 -> a
+    663:663:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$10(com.android.tools.r8.graph.DexMethod):744:744 -> a
+    664:672:void lambda$run$12(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.ClassNameMapper$Builder,java.util.Map$Entry):770:778 -> a
+    673:673:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position,java.util.Map):822:822 -> a
+    674:693:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position,java.util.Map):820:839 -> a
+    694:701:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position,java.util.Map):836:843 -> a
+    702:702:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$Builder com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation.builder():109:109 -> a
+    702:702:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position,java.util.Map):843 -> a
+    703:703:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position,java.util.Map):847:847 -> a
+    704:704:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position,java.util.Map):846:846 -> a
+    705:705:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position,java.util.Map):845:845 -> a
+    706:706:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position,java.util.Map):844:844 -> a
+    707:707:com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation$RemoveInnerFramesAction.create(int):269:269 -> a
+    707:707:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position,java.util.Map):848 -> a
+    708:709:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position,java.util.Map):848:849 -> a
+    710:720:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange getMappedRangesForPosition(com.android.tools.r8.graph.AppView,java.util.function.Function,com.android.tools.r8.naming.ClassNaming$Builder,com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.naming.Range,com.android.tools.r8.naming.Range,com.android.tools.r8.ir.code.Position,java.util.Map):842:852 -> a
+    721:734:int getMethodStartLine(com.android.tools.r8.graph.ProgramMethod):900:913 -> a
+    735:735:void sortMethods(java.util.List):922:922 -> a
+    736:740:int lambda$sortMethods$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):924:928 -> a
+    741:741:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1199:1199 -> a
+    741:741:int lambda$sortMethods$14(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):928 -> a
+    742:742:void addFieldsToClassNaming(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox):949:949 -> a
+    743:747:void lambda$addFieldsToClassNaming$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):951:955 -> a
+    748:748:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):185:185 -> a
+    748:748:void lambda$addFieldsToClassNaming$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):956 -> a
+    749:749:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
+    749:749:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
+    749:749:void lambda$addFieldsToClassNaming$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):956 -> a
+    750:750:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
+    750:750:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    705:705:void lambda$addFieldsToClassNaming$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):910 -> a
-    706:706:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
-    706:706:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
-    706:706:void lambda$addFieldsToClassNaming$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):910 -> a
-    707:708:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186:187 -> a
-    707:708:void lambda$addFieldsToClassNaming$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):910 -> a
-    709:710:void lambda$addFieldsToClassNaming$13(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):911:912 -> a
-    711:712:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):919:920 -> a
-    713:713:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():257:257 -> a
-    713:713:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):921 -> a
-    714:714:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
-    714:714:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():257 -> a
-    714:714:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):921 -> a
-    715:721:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):921:927 -> a
-    722:722:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
-    722:722:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):927 -> a
+    750:750:void lambda$addFieldsToClassNaming$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):956 -> a
+    751:751:java.lang.String com.android.tools.r8.graph.DexField.qualifiedName():190:190 -> a
+    751:751:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186 -> a
+    751:751:void lambda$addFieldsToClassNaming$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):956 -> a
+    752:753:com.android.tools.r8.naming.MemberNaming$FieldSignature com.android.tools.r8.naming.MemberNaming$FieldSignature.fromDexField(com.android.tools.r8.graph.DexField,boolean):186:187 -> a
+    752:753:void lambda$addFieldsToClassNaming$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):956 -> a
+    754:755:void lambda$addFieldsToClassNaming$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.LazyBox,com.android.tools.r8.graph.DexEncodedField):957:958 -> a
+    756:757:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):965:966 -> a
+    758:758:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():261:261 -> a
+    758:758:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):967 -> a
+    759:759:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> a
+    759:759:java.lang.Iterable com.android.tools.r8.graph.DexProgramClass.programMethods():261 -> a
+    759:759:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):967 -> a
+    760:766:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):967:973 -> a
+    767:767:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):317:317 -> a
+    767:767:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):973 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    723:727:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):928:932 -> a
-    728:728:java.util.List lambda$groupMethodsByRenamedName$14(com.android.tools.r8.graph.DexString):931:931 -> a
-    729:736:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):939:946 -> a
-    737:739:boolean com.android.tools.r8.utils.LineNumberOptimizer.doesContainPositions(com.android.tools.r8.graph.CfCode):968:970 -> a
-    737:739:boolean doesContainPositions(com.android.tools.r8.graph.DexEncodedMethod):946 -> a
-    740:748:boolean doesContainPositions(com.android.tools.r8.graph.DexCode):952:960 -> a
-    749:760:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1254:1265 -> a
-    749:760:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):89 -> a
-    761:761:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1257:1257 -> a
-    761:761:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):89 -> a
+    768:772:java.util.IdentityHashMap groupMethodsByRenamedName(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):974:978 -> a
+    773:773:java.util.List lambda$groupMethodsByRenamedName$16(com.android.tools.r8.graph.DexString):977:977 -> a
+    774:781:boolean mustHaveResidualDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.InternalOptions):986:993 -> a
+    782:784:boolean com.android.tools.r8.utils.LineNumberOptimizer.mustHaveResidualDebugInfo(com.android.tools.r8.graph.CfCode):1020:1022 -> a
+    782:784:boolean mustHaveResidualDebugInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.InternalOptions):993 -> a
+    785:796:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1324:1335 -> a
+    785:796:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):89 -> a
+    797:797:com.android.tools.r8.ir.code.Position com.android.tools.r8.utils.LineNumberOptimizer.remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1327:1327 -> a
+    797:797:com.android.tools.r8.ir.code.Position access$1400(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):89 -> a
+    798:798:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2047:2047 -> a
+    798:798:boolean mustHaveResidualDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.utils.InternalOptions):1000 -> a
+      # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
+    799:799:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():2047:2047 -> a
+    799:799:boolean mustHaveResidualDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.utils.InternalOptions):1000 -> a
+    800:808:boolean mustHaveResidualDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.utils.InternalOptions):1004:1012 -> a
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> b
-    1:1:void lambda$run$1(java.lang.Object):512 -> b
-    2:2:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$7(com.android.tools.r8.graph.DexMethod):640:640 -> b
-    3:19:com.android.tools.r8.ir.code.Position getPositionFromPositionState(com.android.tools.r8.graph.DexDebugPositionState):1104:1120 -> b
-    20:34:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1275:1289 -> b
-    35:35:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1279:1279 -> b
+    1:1:void lambda$run$1(java.lang.Object):515 -> b
+    2:2:com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder lambda$run$7(com.android.tools.r8.graph.DexMethod):645:645 -> b
+    3:19:com.android.tools.r8.ir.code.Position getPositionFromPositionState(com.android.tools.r8.graph.DexDebugPositionState):1177:1193 -> b
+    20:34:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1345:1359 -> b
+    35:35:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1349:1349 -> b
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> c
-    1:1:void lambda$run$2(java.lang.Object):520 -> c
+    1:1:void lambda$run$11(java.lang.Object):778 -> c
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> d
-    1:1:void lambda$run$3(java.lang.Object):625 -> d
+    1:1:void lambda$run$2(java.lang.Object):523 -> d
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> e
-    1:1:void lambda$run$8(java.lang.Object):709 -> e
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.rD:
+    1:1:void lambda$run$3(java.lang.Object):630 -> e
+    1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> f
+    1:1:void lambda$run$8(java.lang.Object):715 -> f
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.xD:
     java.util.List val$processedEvents -> o
     boolean $assertionsDisabled -> p
     int emittedPc -> j
@@ -129022,39 +130153,39 @@
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> l
     com.android.tools.r8.utils.Box val$inlinedOriginalPosition -> n
     java.util.List val$mappedPositions -> m
-    1:1:void <clinit>():1005:1005 -> <clinit>
-    1:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.utils.Box,java.util.List):1005:1008 -> <init>
-    1:3:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1012:1014 -> a
-    1:3:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):1062 -> a
-    4:4:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):1063:1063 -> a
-    5:7:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1012:1014 -> a
-    5:7:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):1068 -> a
-    8:8:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):1069:1069 -> a
-    9:11:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1012:1014 -> a
-    9:11:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):1056 -> a
-    12:12:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):1057:1057 -> a
-    13:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1021:1030 -> a
-    23:23:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):1039:1039 -> a
-    24:24:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):1044:1044 -> a
-    25:25:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):1049:1049 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.sD:
+    1:1:void <clinit>():1055:1055 -> <clinit>
+    1:4:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List,com.android.tools.r8.utils.Box,java.util.List):1055:1058 -> <init>
+    1:3:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1062:1064 -> a
+    1:3:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):1112 -> a
+    4:4:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):1113:1113 -> a
+    5:7:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1062:1064 -> a
+    5:7:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):1118 -> a
+    8:8:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):1119:1119 -> a
+    9:11:void com.android.tools.r8.utils.LineNumberOptimizer$1.flushPc():1062:1064 -> a
+    9:11:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):1106 -> a
+    12:12:void visit(com.android.tools.r8.graph.DexDebugEvent$StartLocal):1107:1107 -> a
+    13:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1071:1080 -> a
+    23:23:void visit(com.android.tools.r8.graph.DexDebugEvent$SetFile):1089:1089 -> a
+    24:24:void visit(com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd):1094:1094 -> a
+    25:25:void visit(com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin):1099:1099 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.yD:
     boolean $assertionsDisabled -> o
     com.android.tools.r8.utils.IntBox val$firstDefaultEventPc -> j
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> m
     com.android.tools.r8.utils.BooleanBox val$singleOriginalLine -> l
     java.util.List val$mappedPositions -> n
     com.android.tools.r8.utils.Pair val$lastPosition -> k
-    1:1:void <clinit>():1141:1141 -> <clinit>
-    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1141:1141 -> <init>
-    1:15:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1144:1158 -> a
-    16:25:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1155:1164 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.tD:
+    1:1:void <clinit>():1212:1212 -> <clinit>
+    1:1:void <init>(int,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.IntBox,com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):1212:1212 -> <init>
+    1:15:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1215:1229 -> a
+    16:25:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):1226:1235 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.zD:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():99:99 -> <clinit>
     1:1:void <init>():99:99 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):99:99 -> <init>
     1:2:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):104:105 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.uD:
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.AD:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> g
     java.util.Map parsedKotlinSourceDebugExtensions -> c
@@ -129081,7 +130212,7 @@
     42:52:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):192:202 -> a
     53:75:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):199:221 -> a
     76:88:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):216:228 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.vD:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.BD:
     boolean isOutline -> e
     com.android.tools.r8.graph.DexMethod outlineCallee -> f
     int obfuscatedLine -> d
@@ -129099,15 +130230,13 @@
     1:1:com.android.tools.r8.ir.code.Position access$700(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):299:299 -> e
     1:1:com.android.tools.r8.graph.DexMethod access$800(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):299:299 -> f
     1:1:com.android.tools.r8.utils.Int2StructuralItemArrayMap access$900(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):299:299 -> g
-com.android.tools.r8.utils.LineNumberOptimizer$NativePcSupport -> com.android.tools.r8.internal.wD:
-    1:1:void <init>():441:441 -> <init>
-    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):441:441 -> <init>
+com.android.tools.r8.utils.LineNumberOptimizer$NativePcSupport -> com.android.tools.r8.internal.CD:
+    1:1:void <init>():448:448 -> <init>
+    2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):448:448 -> <init>
     void updateDebugInfoInCodeObjects() -> a
-    1:1:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int):452:452 -> a
-    2:2:void com.android.tools.r8.utils.LineNumberOptimizer$NativePcSupport.recordSingleLineFor(com.android.tools.r8.graph.DexCode,int):452:452 -> a
-    2:2:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int):457 -> a
-    1:1:void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int):446:446 -> b
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.xD:
+    1:1:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int):459:459 -> a
+    1:1:void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int):453:453 -> b
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.DD:
     boolean $assertionsDisabled -> e
     int nextOptimizedLineNumber -> d
     com.android.tools.r8.graph.DexMethod previousMethod -> b
@@ -129117,55 +130246,57 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):115:115 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):111:119 -> <init>
     1:18:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):124:141 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder -> com.android.tools.r8.internal.yD:
+com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder -> com.android.tools.r8.internal.ED:
     java.util.List mappedOutlineCalleePositions -> b
     java.util.List mappedOutlinePositions -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1293:1293 -> <clinit>
-    1:6:void <init>():1293:1298 -> <init>
-    7:7:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):1293:1293 -> <init>
+    1:1:void <clinit>():1363:1363 -> <clinit>
+    1:6:void <init>():1363:1368 -> <init>
+    7:7:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):1363:1363 -> <init>
     1:1:com.android.tools.r8.errors.Unreachable com.android.tools.r8.errors.Unreachable.raise(java.lang.Object[]):16:16 -> a
-    1:1:void lambda$fixup$1(java.lang.Object):1329 -> a
-    2:2:void setMappedPositionsOutline(java.util.List):1302:1302 -> a
-    3:3:void addMappedRangeForOutlineCallee(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):1307:1307 -> a
-    4:12:void fixup():1311:1319 -> a
+    1:1:void lambda$fixup$1(java.lang.Object):1399 -> a
+    2:2:void setMappedPositionsOutline(java.util.List):1372:1372 -> a
+    3:3:void addMappedRangeForOutlineCallee(com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):1377:1377 -> a
+    4:12:void fixup():1381:1389 -> a
     13:13:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap.<init>():176:176 -> a
-    13:13:void fixup():1319 -> a
-    14:23:void fixup():1320:1329 -> a
-    24:24:void fixup():1328:1328 -> a
-    25:26:void fixup():1312:1313 -> a
-    27:27:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1323:1323 -> a
-    28:30:int com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder.getMinifiedLinePosition(int,java.util.List):1335:1337 -> a
-    28:30:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1323 -> a
-    31:31:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1325:1325 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport -> com.android.tools.r8.internal.zD:
-    java.util.List codesToUpdate -> b
-    com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap paramToMaxPc -> a
-    java.util.List singleLineCodesToClear -> c
-    1:1:void <init>(boolean):385:385 -> <init>
-    2:11:void <init>(boolean):377:386 -> <init>
-    1:6:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int):400:405 -> a
-    7:11:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int):410:414 -> a
-    12:13:void updateDebugInfoInCodeObjects():419:420 -> a
-    14:14:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(int):110:110 -> a
-    14:14:void updateDebugInfoInCodeObjects():420 -> a
-    15:26:void updateDebugInfoInCodeObjects():421:432 -> a
-    27:31:void lambda$updateDebugInfoInCodeObjects$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.Pair):423:427 -> a
-    32:35:void lambda$updateDebugInfoInCodeObjects$1(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.utils.Pair):426:429 -> a
-    36:36:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):428:428 -> a
-    37:38:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):120:121 -> a
-    37:38:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):428 -> a
-    39:39:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):428:428 -> a
-    40:40:com.android.tools.r8.graph.DexDebugInfo com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport.buildPc2PcDebugInfo(int,int):437:437 -> a
-    40:40:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(int,java.lang.Integer):428 -> a
-    41:41:void lambda$updateDebugInfoInCodeObjects$2(com.android.tools.r8.graph.DexCode):432:432 -> a
-    1:4:void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int):391:394 -> b
-com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder -> com.android.tools.r8.internal.AD:
-    void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int) -> a
+    13:13:void fixup():1389 -> a
+    14:23:void fixup():1390:1399 -> a
+    24:24:void fixup():1398:1398 -> a
+    25:26:void fixup():1382:1383 -> a
+    27:27:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1393:1393 -> a
+    28:30:int com.android.tools.r8.utils.LineNumberOptimizer$OutlineFixupBuilder.getMinifiedLinePosition(int,java.util.List):1405:1407 -> a
+    28:30:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1393 -> a
+    31:31:void lambda$fixup$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntSortedMap,java.lang.Integer,java.lang.Integer):1395:1395 -> a
+com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport -> com.android.tools.r8.internal.GD:
+    java.util.List singleLineCodesToClear -> b
+    java.util.List codesToUpdate -> a
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():371:371 -> <clinit>
+    1:1:void <init>(boolean):405:405 -> <init>
+    2:9:void <init>(boolean):399:406 -> <init>
+    1:5:void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int):417:421 -> a
+    6:6:void updateDebugInfoInCodeObjects():426:426 -> a
+    7:7:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceOpenHashMap.<init>():118:118 -> a
+    7:7:void updateDebugInfoInCodeObjects():426 -> a
+    8:19:void updateDebugInfoInCodeObjects():428:439 -> a
+    20:26:void lambda$updateDebugInfoInCodeObjects$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport$UpdateInfo):430:436 -> a
+    27:27:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport$UpdateInfo):434:434 -> a
+    28:28:com.android.tools.r8.graph.DexDebugInfo com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport.buildPc2PcDebugInfo(int,int):444:444 -> a
+    28:28:com.android.tools.r8.graph.DexDebugInfo lambda$updateDebugInfoInCodeObjects$0(com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport$UpdateInfo):434 -> a
+    29:29:void lambda$updateDebugInfoInCodeObjects$2(com.android.tools.r8.graph.DexCode):439:439 -> a
+    1:2:void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int):411:412 -> b
+com.android.tools.r8.utils.LineNumberOptimizer$Pc2PcMappingSupport$UpdateInfo -> com.android.tools.r8.internal.FD:
+    int paramCount -> b
+    int maxEncodingPc -> c
+    com.android.tools.r8.graph.DexCode code -> a
+    1:4:void <init>(com.android.tools.r8.graph.DexCode,int,int):378:381 -> <init>
+    1:2:boolean equals(java.lang.Object):389:390 -> equals
+    1:1:int hashCode():395:395 -> hashCode
+com.android.tools.r8.utils.LineNumberOptimizer$PcBasedDebugInfoRecorder -> com.android.tools.r8.internal.HD:
     void recordSingleLineFor(com.android.tools.r8.graph.DexCode,int,int) -> a
     void updateDebugInfoInCodeObjects() -> a
     void recordPcMappingFor(com.android.tools.r8.graph.DexCode,int,int) -> b
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.BD:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.ID:
     java.util.List processedEvents -> f
     int previousPc -> d
     boolean $assertionsDisabled -> g
@@ -129197,9 +130328,9 @@
     21:21:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():294:294 -> a
     21:21:int access$1600(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):255 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.CD:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.JD:
     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.SD:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.ZD:
     1:2:java.util.List flatMap(java.util.List,java.util.function.Function):52:53 -> a
     3:3:void lambda$flatMap$0(java.util.List,java.util.function.Function,java.lang.Object):53:53 -> a
     4:5:java.util.List filter(java.util.Collection,java.util.function.Predicate):58:59 -> a
@@ -129222,8 +130353,8 @@
     1:2:int firstIndexMatching(java.util.List,java.util.function.Predicate):78:79 -> c
     1:2:int lastIndexMatching(java.util.List,java.util.function.Predicate):91:92 -> d
     1:3:int uniqueIndexMatching(java.util.List,java.util.function.Predicate):284:286 -> e
-com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.RD:
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.GE:
+com.android.tools.r8.utils.ListUtils$ReferenceAndIntConsumer -> com.android.tools.r8.internal.YD:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.NE:
     long max -> b
     long min -> a
     boolean $assertionsDisabled -> c
@@ -129231,20 +130362,20 @@
     1:4:void <init>(int,int):15:18 -> <init>
     5:8:void <init>(long,long):21:24 -> <init>
     1:1:long getMax():32:32 -> a
-    2:2:boolean containsValue(long):45:45 -> a
-    3:3:boolean overlapsWith(com.android.tools.r8.utils.LongInterval):53:53 -> a
+    2:2:boolean containsValue(long):49:49 -> a
+    3:3:boolean overlapsWith(com.android.tools.r8.utils.LongInterval):57:57 -> a
     1:1:long getMin():28:28 -> b
-    1:2:long getSingleValue():40:41 -> c
+    1:2:long getSingleValue():44:45 -> c
     1:1:boolean isSingleValue():36:36 -> d
-    1:2:boolean equals(java.lang.Object):66:67 -> equals
-    1:1:int hashCode():58:58 -> hashCode
+    1:2:boolean equals(java.lang.Object):70:71 -> equals
+    1:1:int hashCode():62:62 -> hashCode
     1:1:java.lang.String toString():0:0 -> toString
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":76,"2":77,"3":78}}
-    76:76:java.lang.String toString():74:74 -> toString
-    77:77:java.lang.String toString():74:74 -> toString
-    78:78:java.lang.String toString():74:74 -> toString
-    75:75:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.fF:
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":80,"2":81,"3":82}}
+    80:80:java.lang.String toString():78:78 -> toString
+    81:81:java.lang.String toString():78:78 -> toString
+    82:82:java.lang.String toString():78:78 -> toString
+    79:79:java.lang.String toString():78:78 -> toString
+com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.mF:
     1:1:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:21 -> a
     2:2:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":41,"3":42}}
@@ -129280,7 +130411,7 @@
     76:76:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     76:76:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37 -> a
     77:77:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37:37 -> a
-com.android.tools.r8.utils.MapIdTemplateProvider -> com.android.tools.r8.internal.hF:
+com.android.tools.r8.utils.MapIdTemplateProvider -> com.android.tools.r8.internal.oF:
     java.util.Map HANDLERS -> c
     java.lang.String template -> a
     java.lang.String cachedValue -> b
@@ -129305,7 +130436,7 @@
     57:63:com.android.tools.r8.MapIdProvider create(java.lang.String,com.android.tools.r8.DiagnosticsHandler):45:51 -> a
     69:69:void lambda$get$0(com.android.tools.r8.MapIdEnvironment,java.lang.String,com.android.tools.r8.MapIdProvider):67:67 -> a
     1:8:java.lang.String get(com.android.tools.r8.MapIdEnvironment):63:70 -> get
-com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.kF:
+com.android.tools.r8.utils.MapUtils -> com.android.tools.r8.internal.rF:
     1:1:java.util.Map clone(java.util.Map,java.util.Map,java.util.function.Function):26:26 -> a
     2:2:void lambda$clone$0(java.util.Map,java.util.function.Function,java.lang.Object,java.lang.Object):26:26 -> a
     3:3:java.util.function.Function ignoreKey(java.util.function.Supplier):39:39 -> a
@@ -129324,7 +130455,7 @@
     2:2:java.lang.String toString(java.util.Map):65:65 -> b
     3:3:java.lang.String toString(java.util.Map):64:64 -> b
     4:4:java.lang.Object lambda$transform$6(java.util.function.Function,java.lang.Object,java.lang.Object):78:78 -> b
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.sG:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.zG:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> c
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> b
     boolean ignoreName -> a
@@ -129338,53 +130469,50 @@
     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.HG:
+com.android.tools.r8.utils.MethodReferenceUtils -> com.android.tools.r8.internal.OG:
     int $r8$clinit -> b
     java.util.Comparator COMPARATOR -> a
     1:1:void <clinit>():24:24 -> <clinit>
-    1:1:java.util.Comparator com.android.tools.r8.utils.MethodReferenceUtils.getMethodReferenceComparator():71:71 -> a
-    1:1:int compare(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):67 -> a
-    2:2:int compare(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):67:67 -> a
-    3:3:java.util.Comparator getMethodReferenceComparator():71:71 -> a
-    4:4:com.android.tools.r8.references.MethodReference mainMethod(java.lang.Class):75:75 -> a
-    5:6:com.android.tools.r8.references.MethodReference com.android.tools.r8.utils.MethodReferenceUtils.mainMethod(com.android.tools.r8.references.ClassReference):79:80 -> a
-    5:6:com.android.tools.r8.references.MethodReference mainMethod(java.lang.Class):75 -> a
-    7:9:com.android.tools.r8.references.MethodReference methodFromMethod(java.lang.Class,java.lang.String,java.lang.Class[]):86:88 -> a
-    10:10:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.graph.DexItemFactory):95:95 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.ClassReferenceUtils.toDexType(com.android.tools.r8.references.ClassReference,com.android.tools.r8.graph.DexItemFactory):40:40 -> a
-    11:11:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.graph.DexItemFactory):95 -> a
-    12:12:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.graph.DexItemFactory):97:97 -> a
-    13:15:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.graph.DexItemFactory):96:98 -> a
-    16:16:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.graph.DexItemFactory):94:94 -> a
-    17:17:java.lang.String toSourceString(com.android.tools.r8.references.MethodReference):106:106 -> a
-    18:24:java.lang.String toSourceString(com.android.tools.r8.references.MethodReference,boolean,boolean):111:117 -> a
-    25:42:java.lang.String toSourceString(com.android.tools.r8.references.MethodReference,boolean,boolean):114:131 -> a
-    1:1:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):28:28 -> b
-    2:2:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.compare(java.lang.Object,java.lang.Object,java.util.Comparator):33:33 -> b
-    2:2:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):27 -> b
-    3:3:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):29:29 -> b
-    4:4:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
-    4:4:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):30 -> b
-    5:5:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):33:33 -> b
-    6:6:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.compare(java.lang.Comparable,java.lang.Comparable):29:29 -> b
-    6:6:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):33 -> b
-    7:7:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):34:34 -> b
-    8:8:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
-    8:8:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):35 -> b
-    9:9:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):39:39 -> b
-    10:10:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.compare(java.lang.Object,java.lang.Object,java.util.Comparator):33:33 -> b
-    10:10:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):38 -> b
-    11:11:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):40:40 -> b
-    12:12:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
-    12:12:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):41 -> b
-    13:19:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):44:50 -> b
-    20:20:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.compare(java.lang.Object,java.lang.Object,java.util.Comparator):33:33 -> b
-    20:20:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):47 -> b
-    21:21:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):51:51 -> b
-    22:22:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> b
-    22:22:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):52 -> b
-    23:23:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):55:55 -> b
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.JG:
+    1:1:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):28:28 -> a
+    2:2:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.compare(java.lang.Object,java.lang.Object,java.util.Comparator):33:33 -> a
+    2:2:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):27 -> a
+    3:3:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):29:29 -> a
+    4:4:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> a
+    4:4:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):30 -> a
+    5:5:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):33:33 -> a
+    6:6:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.compare(java.lang.Comparable,java.lang.Comparable):29:29 -> a
+    6:6:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):33 -> a
+    7:7:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):34:34 -> a
+    8:8:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> a
+    8:8:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):35 -> a
+    9:9:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):39:39 -> a
+    10:10:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.compare(java.lang.Object,java.lang.Object,java.util.Comparator):33:33 -> a
+    10:10:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):38 -> a
+    11:11:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):40:40 -> a
+    12:12:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> a
+    12:12:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):41 -> a
+    13:19:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):44:50 -> a
+    20:20:com.android.tools.r8.utils.CompareResult com.android.tools.r8.utils.CompareResult.compare(java.lang.Object,java.lang.Object,java.util.Comparator):33:33 -> a
+    20:20:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):47 -> a
+    21:21:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):51:51 -> a
+    22:22:int com.android.tools.r8.utils.CompareResult.getComparisonResult():21:21 -> a
+    22:22:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):52 -> a
+    23:23:int lambda$static$0(com.android.tools.r8.references.MethodReference,com.android.tools.r8.references.MethodReference):55:55 -> a
+    24:24:java.util.Comparator getMethodReferenceComparator():71:71 -> a
+    25:25:com.android.tools.r8.references.MethodReference mainMethod(java.lang.Class):75:75 -> a
+    26:27:com.android.tools.r8.references.MethodReference com.android.tools.r8.utils.MethodReferenceUtils.mainMethod(com.android.tools.r8.references.ClassReference):79:80 -> a
+    26:27:com.android.tools.r8.references.MethodReference mainMethod(java.lang.Class):75 -> a
+    28:30:com.android.tools.r8.references.MethodReference methodFromMethod(java.lang.Class,java.lang.String,java.lang.Class[]):86:88 -> a
+    31:31:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.graph.DexItemFactory):95:95 -> a
+    32:32:com.android.tools.r8.graph.DexType com.android.tools.r8.utils.ClassReferenceUtils.toDexType(com.android.tools.r8.references.ClassReference,com.android.tools.r8.graph.DexItemFactory):40:40 -> a
+    32:32:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.graph.DexItemFactory):95 -> a
+    33:33:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.graph.DexItemFactory):97:97 -> a
+    34:36:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.graph.DexItemFactory):96:98 -> a
+    37:37:com.android.tools.r8.graph.DexMethod toDexMethod(com.android.tools.r8.references.MethodReference,com.android.tools.r8.graph.DexItemFactory):94:94 -> a
+    38:38:java.lang.String toSourceString(com.android.tools.r8.references.MethodReference):106:106 -> a
+    39:45:java.lang.String toSourceString(com.android.tools.r8.references.MethodReference,boolean,boolean):111:117 -> a
+    46:63:java.lang.String toSourceString(com.android.tools.r8.references.MethodReference,boolean,boolean):114:131 -> a
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.QG:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(boolean):23:23 -> <init>
@@ -129395,10 +130523,10 @@
     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.ObjectUtils -> com.android.tools.r8.internal.tM:
+com.android.tools.r8.utils.ObjectUtils -> com.android.tools.r8.internal.KM:
     1:1:boolean getBooleanOrElse(java.lang.Object,java.util.function.Predicate,boolean):14:14 -> a
     2:2:java.lang.Object mapNotNullOrDefault(java.lang.Object,java.lang.Object,java.util.function.Function):31:31 -> a
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.yM:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.PM:
     com.android.tools.r8.utils.OffOrAuto Auto -> c
     com.android.tools.r8.utils.OffOrAuto Off -> b
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> d
@@ -129420,7 +130548,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.SM:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.jN:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> c
     com.android.tools.r8.utils.OptionalBool TRUE -> a
     com.android.tools.r8.utils.OptionalBool FALSE -> b
@@ -129429,22 +130557,22 @@
     1:1:com.android.tools.r8.utils.OptionalBool of(boolean):69:69 -> a
     int ordinal() -> f
     1:1:int hashCode():88:88 -> hashCode
-com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.PM:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.gN:
     1:1:void <init>():10:10 -> <init>
     boolean isTrue() -> d
     int ordinal() -> f
     1:1:java.lang.String toString():24:24 -> toString
-com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.QM:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.hN:
     1:1:void <init>():29:29 -> <init>
     boolean isFalse() -> a
     int ordinal() -> f
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.RM:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.iN:
     1:1:void <init>():48:48 -> <init>
     boolean isUnknown() -> e
     int ordinal() -> f
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.VM:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.mN:
     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
@@ -129458,14 +130586,14 @@
     96:96:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):65:65 -> a
     91:93:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):65: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.UM:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.lN:
     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.aN:
+com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.rN:
     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>
@@ -129473,7 +130601,7 @@
     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.OriginalSourceFiles -> com.android.tools.r8.internal.eN:
+com.android.tools.r8.utils.OriginalSourceFiles -> com.android.tools.r8.internal.vN:
     com.android.tools.r8.utils.OriginalSourceFiles UNREACHABLE -> a
     com.android.tools.r8.utils.OriginalSourceFiles FROM_CLASSES -> b
     1:9:void <clinit>():15:23 -> <clinit>
@@ -129482,17 +130610,17 @@
     1:1:com.android.tools.r8.utils.OriginalSourceFiles fromClasses():38:38 -> a
     2:2:com.android.tools.r8.utils.OriginalSourceFiles fromMap(java.util.Map):43:43 -> a
     1:1:com.android.tools.r8.utils.OriginalSourceFiles unreachable():33:33 -> b
-com.android.tools.r8.utils.OriginalSourceFiles$1 -> com.android.tools.r8.internal.bN:
+com.android.tools.r8.utils.OriginalSourceFiles$1 -> com.android.tools.r8.internal.sN:
     1:1:void <init>():16:16 -> <init>
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):19:19 -> a
-com.android.tools.r8.utils.OriginalSourceFiles$2 -> com.android.tools.r8.internal.cN:
+com.android.tools.r8.utils.OriginalSourceFiles$2 -> com.android.tools.r8.internal.tN:
     1:1:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):27:27 -> a
-com.android.tools.r8.utils.OriginalSourceFiles$3 -> com.android.tools.r8.internal.dN:
+com.android.tools.r8.utils.OriginalSourceFiles$3 -> com.android.tools.r8.internal.uN:
     java.util.Map val$map -> c
     1:1:void <init>(java.util.Map):43:43 -> <init>
     1:1:com.android.tools.r8.graph.DexString getOriginalSourceFile(com.android.tools.r8.graph.DexProgramClass):46:46 -> a
-com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.BN:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.SN:
 # {"id":"sourceFile","fileName":"Pair.java"}
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -129511,7 +130639,7 @@
     59:59:java.lang.String toString():56:56 -> toString
     60:60:java.lang.String toString():56:56 -> toString
     57:57:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.oO:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.GO:
     java.util.List predicates -> b
     java.util.Set elements -> a
     1:4:void <init>():14:17 -> <init>
@@ -129520,13 +130648,13 @@
     3:3:com.android.tools.r8.utils.PredicateSet empty():28:28 -> a
     4:10:com.android.tools.r8.utils.PredicateSet rewriteItems(java.util.function.Function):32:38 -> a
     1:5:boolean contains(java.lang.Object):43:47 -> b
-com.android.tools.r8.utils.PredicateUtils -> com.android.tools.r8.internal.pO:
+com.android.tools.r8.utils.PredicateUtils -> com.android.tools.r8.internal.HO:
     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.yO:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.QO:
     java.util.Map content -> b
     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>
@@ -129536,7 +130664,7 @@
     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$Builder -> com.android.tools.r8.internal.yO$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.QO$a:
     java.util.Map content -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():74:74 -> <clinit>
@@ -129545,11 +130673,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.zO:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.RO:
     java.lang.String descriptor -> f
     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.XO:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.pP:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():18:18 -> <clinit>
@@ -129573,11 +130701,11 @@
     20:22:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:76 -> a
     20:22:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):86 -> a
     20:22: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):66 -> a
-    23:23:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    23:23:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     23:23:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
     23:23:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):86 -> a
     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):66 -> a
-    24:24:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    24:24:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     24:24:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     24:24:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.utils.ProgramClassCollection.mergeClasses(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):86 -> a
@@ -129590,10 +130718,10 @@
     26:26: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):66 -> a
     27:29:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):74:76 -> a
     27:29: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):68 -> a
-    30:30:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    30:30:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     30:30:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
     30:30: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):68 -> a
-    31:31:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():783:783 -> a
+    31:31:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():797:797 -> a
     31:31:java.lang.RuntimeException com.android.tools.r8.utils.ProgramClassCollection.reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     31:31: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):68 -> a
@@ -129608,7 +130736,7 @@
     45:45:java.lang.String toString():42:42 -> toString
     46:46:java.lang.String toString():42:42 -> toString
     43:43:java.lang.String toString():42:42 -> toString
-com.android.tools.r8.utils.ProgramFieldEquivalence -> com.android.tools.r8.internal.dP:
+com.android.tools.r8.utils.ProgramFieldEquivalence -> com.android.tools.r8.internal.vP:
     com.android.tools.r8.utils.ProgramFieldEquivalence INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -129619,7 +130747,7 @@
     4:4:int com.android.tools.r8.utils.ProgramFieldEquivalence.doHash(com.android.tools.r8.graph.ProgramField):27:27 -> a
     4:4:int doHash(java.lang.Object):10 -> a
     5:5:com.android.tools.r8.utils.ProgramFieldEquivalence get():17:17 -> a
-com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.iP:
+com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.AP:
     com.android.tools.r8.utils.ProgramMethodEquivalence INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -129630,16 +130758,18 @@
     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.ReflectionHelper -> com.android.tools.r8.internal.qU:
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveFieldOperation -> com.android.tools.r8.internal.lU:
+com.android.tools.r8.utils.QuadConsumer -> com.android.tools.r8.internal.vS:
+    void accept(java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object) -> a
+com.android.tools.r8.utils.ReflectionHelper -> com.android.tools.r8.internal.LU:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveFieldOperation -> com.android.tools.r8.internal.GU:
     1:1:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer,com.android.tools.r8.utils.ReflectionHelper$1):72:72 -> <init>
     2:2:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer):79:79 -> <init>
     1:5:java.lang.Object compute(java.lang.Object):84:88 -> a
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveMethodOperation -> com.android.tools.r8.internal.mU:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveMethodOperation -> com.android.tools.r8.internal.HU:
     1:1:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer,com.android.tools.r8.utils.ReflectionHelper$1):51:51 -> <init>
     2:2:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer):58:58 -> <init>
     1:6:java.lang.Object compute(java.lang.Object):63:68 -> a
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation -> com.android.tools.r8.internal.nU:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation -> com.android.tools.r8.internal.IU:
     java.util.function.Consumer modifier -> c
     com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation nextOperation -> d
     java.lang.Class classForDeclaration -> a
@@ -129647,7 +130777,7 @@
     1:1:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer,com.android.tools.r8.utils.ReflectionHelper$1):30:30 -> <init>
     2:6:void <init>(java.lang.Class,java.lang.String,com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperation,java.util.function.Consumer):41:45 -> <init>
     java.lang.Object compute(java.lang.Object) -> a
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder -> com.android.tools.r8.internal.oU:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder -> com.android.tools.r8.internal.JU:
     com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder sequenceBuilder -> d
     boolean $assertionsDisabled -> e
     java.lang.String declaredMember -> a
@@ -129663,7 +130793,7 @@
     16:17:void lambda$build$0(java.lang.reflect.Field):153:154 -> a
     18:19:void lambda$build$1(java.lang.reflect.Method):164:165 -> a
     1:1:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder setSetAccessible(boolean):138:138 -> b
-com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder -> com.android.tools.r8.internal.pU:
+com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder -> com.android.tools.r8.internal.KU:
     java.util.List reflectiveOperationBuilderList -> a
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():92:92 -> <clinit>
@@ -129674,7 +130804,7 @@
     1:1:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder readMethod(java.lang.String):0:0 -> b
     2:4:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationSequenceBuilder.add(java.lang.String,com.android.tools.r8.utils.ReflectionHelper$DeclaredType):105:107 -> b
     2:4:com.android.tools.r8.utils.ReflectionHelper$ReflectiveOperationBuilder readMethod(java.lang.String):97 -> b
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.bV:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.wV:
     java.util.List diagnosticsLevelMapping -> b
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.utils.AbortException abort -> c
@@ -129696,19 +130826,19 @@
     1:1:void error(com.android.tools.r8.Diagnostic):109:109 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):91:91 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):100:100 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.YU:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.tV:
     1:1:void <init>():56:56 -> <init>
-com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.ZU:
+com.android.tools.r8.utils.Reporter$2 -> com.android.tools.r8.internal.uV:
     int[] $SwitchMap$com$android$tools$r8$DiagnosticsLevel -> a
     1:1:void <clinit>():73:73 -> <clinit>
-com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.aV:
+com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.vV:
     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:13:com.android.tools.r8.DiagnosticsLevel map(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.Diagnostic):32:44 -> a
     14:14:com.android.tools.r8.DiagnosticsLevel map(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.Diagnostic):38:38 -> a
-com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.xW:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.SW:
     java.util.TreeMap internalTree -> a
     boolean allowIntervalOverwrites -> b
     int size -> c
@@ -129721,7 +130851,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.yW:
+com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.TW:
     int minor -> b
     int patch -> c
     int major -> a
@@ -129786,7 +130916,7 @@
     217:217:java.lang.String toString():105:105 -> toString
     218:218:java.lang.String toString():105:105 -> toString
     212:212:java.lang.String toString():105:105 -> toString
-com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.CW:
+com.android.tools.r8.utils.SetUtils -> com.android.tools.r8.internal.XW:
     1:1:java.util.Set newConcurrentHashSet(int):28:28 -> a
     2:3:java.util.HashSet newHashSet(java.lang.Object):32:33 -> a
     4:5:java.util.HashSet newHashSet(java.lang.Object[]):39:40 -> a
@@ -129799,14 +130929,14 @@
     1:1:java.util.Set newIdentityHashSet(int):85:85 -> b
     2:4:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSet(com.android.tools.r8.utils.ForEachable):95:97 -> b
     5:11:com.android.tools.r8.com.google.common.collect.ImmutableSet newImmutableSetExcludingNullItems(java.lang.Object[]):102:108 -> b
-com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.SX:
+com.android.tools.r8.utils.SortingStringConsumer -> com.android.tools.r8.internal.nY:
     java.util.List accepted -> b
     1:1:void <init>(com.android.tools.r8.StringConsumer):24:24 -> <init>
     2:2:void <init>(com.android.tools.r8.StringConsumer):17:17 -> <init>
     1:1:void lambda$finished$0(com.android.tools.r8.DiagnosticsHandler,java.lang.String):35:35 -> a
     1:1:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):29:29 -> accept
     1:3:void finished(com.android.tools.r8.DiagnosticsHandler):34:36 -> finished
-com.android.tools.r8.utils.SourceFileTemplateProvider -> com.android.tools.r8.internal.WX:
+com.android.tools.r8.utils.SourceFileTemplateProvider -> com.android.tools.r8.internal.rY:
     java.util.Map HANDLERS -> c
     java.lang.String template -> a
     java.lang.String cachedValue -> b
@@ -129834,7 +130964,7 @@
     58:64:com.android.tools.r8.SourceFileProvider create(java.lang.String,com.android.tools.r8.DiagnosticsHandler):46:52 -> a
     70:70:void lambda$get$0(com.android.tools.r8.SourceFileEnvironment,java.lang.String,com.android.tools.r8.SourceFileProvider):68:68 -> a
     1:8:java.lang.String get(com.android.tools.r8.SourceFileEnvironment):64:71 -> get
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.bZ:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.wZ:
     1:2:byte[] streamToByteArrayClose(java.io.InputStream):18:19 -> a
 com.android.tools.r8.utils.StringDiagnostic -> com.android.tools.r8.utils.StringDiagnostic:
     com.android.tools.r8.origin.Origin origin -> b
@@ -129848,7 +130978,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.JZ:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.e00:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -129931,20 +131061,28 @@
     584:584:java.lang.String com.android.tools.r8.utils.StringUtils.hexString(long,int,boolean):259:259 -> a
     584:584:java.lang.String hexString(long,int):247 -> a
     585:589:java.lang.String times(java.lang.String,int):278:282 -> a
-    590:590:boolean isWhitespace(int):290:290 -> a
-    591:591:java.lang.String replaceAll(java.lang.String,java.lang.String,java.lang.String):347:347 -> a
-    592:595:java.lang.String capitalize(java.lang.String):357:360 -> a
-    1:1:java.lang.String lines(java.lang.String[]):166:166 -> b
-    2:19:java.util.List splitLines(java.lang.String):188:205 -> b
-    20:20:java.lang.String zeroPrefix(int,int):212:212 -> b
-    1:2:java.lang.String stripLeadingBOM(java.lang.String):294:295 -> c
-    1:9:java.lang.String toASCIIString(java.lang.String):53:61 -> d
-    1:9:java.lang.String trim(java.lang.String):303:311 -> e
-    1:5:java.lang.String withNativeLineSeparator(java.lang.String):170:174 -> f
-com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.IZ:
+    590:590:boolean isWhitespace(int):298:298 -> a
+    591:591:java.lang.String replaceAll(java.lang.String,java.lang.String,java.lang.String):355:355 -> a
+    592:595:java.lang.String capitalize(java.lang.String):369:372 -> a
+    1:1:java.lang.String quote(java.lang.String):0:0 -> b
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":360,"2":361,"3":362,"4":363,"5":364,"6":365}}
+    360:360:java.lang.String quote(java.lang.String):359:359 -> b
+    361:361:java.lang.String quote(java.lang.String):359:359 -> b
+    362:362:java.lang.String quote(java.lang.String):359:359 -> b
+    363:363:java.lang.String quote(java.lang.String):359:359 -> b
+    364:364:java.lang.String quote(java.lang.String):359:359 -> b
+    365:365:java.lang.String quote(java.lang.String):359:359 -> b
+    366:366:java.lang.String lines(java.lang.String[]):166:166 -> b
+    367:367:java.lang.String zeroPrefix(int,int):212:212 -> b
+    1:18:java.util.List splitLines(java.lang.String):188:205 -> c
+    1:2:java.lang.String stripLeadingBOM(java.lang.String):302:303 -> d
+    1:9:java.lang.String toASCIIString(java.lang.String):53:61 -> e
+    1:9:java.lang.String trim(java.lang.String):311:319 -> f
+    1:5:java.lang.String withNativeLineSeparator(java.lang.String):170:174 -> g
+com.android.tools.r8.utils.StringUtils$1 -> com.android.tools.r8.internal.d00:
     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.JZ$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.e00$a:
     com.android.tools.r8.utils.StringUtils$BraceType PARENS -> b
     com.android.tools.r8.utils.StringUtils$BraceType SQUARE -> c
     com.android.tools.r8.utils.StringUtils$BraceType[] $VALUES -> f
@@ -129954,10 +131092,10 @@
     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.SupplierUtils -> com.android.tools.r8.internal.d00:
+com.android.tools.r8.utils.SupplierUtils -> com.android.tools.r8.internal.y00:
     1:3:java.lang.Object lambda$memoize$1(com.android.tools.r8.utils.ThrowingSupplier):21:23 -> a
     1:1:java.util.function.Supplier memoize(com.android.tools.r8.utils.ThrowingSupplier):18:18 -> b
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.o00:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.J00:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set RESERVED_NAMES -> a
@@ -129970,11 +131108,34 @@
     1:1:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):32:32 -> a
     2:35:java.lang.String com.android.tools.r8.utils.SymbolGenerationUtils.numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[],boolean):44:77 -> a
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):32 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.o00$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.J00$a:
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> c
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> b
     1:2:void <clinit>():16:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):15:15 -> <init>
+com.android.tools.r8.utils.SystemPropertyUtils -> com.android.tools.r8.internal.c10:
+    1:1:java.lang.String getSystemPropertyForDevelopment(java.lang.String):15:15 -> a
+    2:2:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):61:61 -> a
+    3:3:boolean com.android.tools.r8.utils.StringUtils.isFalsy(java.lang.String):290:290 -> a
+    3:3:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):61 -> a
+    4:4:boolean com.android.tools.r8.utils.StringUtils.isTruthy(java.lang.String):294:294 -> a
+    4:4:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):64 -> a
+    5:5:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):67:67 -> a
+    6:6:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":74,"2":75,"3":76,"4":77,"5":78,"6":79,"7":80}}
+    74:74:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):67:67 -> a
+    75:75:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):67:67 -> a
+    76:76:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):67:67 -> a
+    77:77:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):67:67 -> a
+    78:78:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):67:67 -> a
+    79:79:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):67:67 -> a
+    80:80:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):67:67 -> a
+    73:73:boolean internalParseSystemPropertyForDevelopmentOrDefault(java.lang.String,java.lang.String,boolean):67:67 -> a
+    81:82:int parseSystemPropertyForDevelopmentOrDefault(java.lang.String,int):78:79 -> a
+    1:1:boolean parseSystemPropertyForDevelopmentOrDefault(java.lang.String,boolean):53:53 -> b
+    2:2:boolean parseSystemPropertyForDevelopmentOrDefault(java.lang.String,boolean):52:52 -> b
+    1:1:boolean parseSystemPropertyOrDefault(java.lang.String,boolean):47:47 -> c
+    2:2:boolean parseSystemPropertyOrDefault(java.lang.String,boolean):46:46 -> c
 com.android.tools.r8.utils.ThreadUtils -> com.android.tools.r8.utils.C:
     1:1:java.util.concurrent.Future processAsynchronously(com.android.tools.r8.utils.Action,java.util.concurrent.ExecutorService):26:26 -> a
     2:2:java.util.concurrent.Future processAsynchronously(java.util.concurrent.Callable,java.util.concurrent.ExecutorService):36:36 -> a
@@ -130015,33 +131176,33 @@
     2:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):188:188 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):195:195 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):189 -> b
-com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.M00:
+com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.i10:
     void execute() -> a
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.N00:
-com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.O00:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.P00:
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.j10:
+com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.k10:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.l10:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.Q00:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.m10:
     1:7:void acceptWithRuntimeException(java.lang.Object):20:26 -> a
-com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.R00:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.T00:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.n10:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.p10:
     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.U00:
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.V00:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.q10:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.r10:
     1:1:void <init>():11:11 -> <init>
     boolean hasNext() -> a
     1:6:java.util.List take(int):25:30 -> a
     7:7:java.util.List take(int):28:28 -> a
     java.lang.Object next() -> b
-com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.W00:
-com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.X00:
+com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.s10:
+com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.t10:
     java.lang.Object apply(java.lang.Object,int) -> a
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.Y00:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.i10:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.u10:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.E10:
     java.util.Stack stack -> b
     com.android.tools.r8.utils.Timing EMPTY -> d
     boolean $assertionsDisabled -> e
@@ -130129,20 +131290,20 @@
     5:9:void com.android.tools.r8.utils.Timing$Node.end():137:141 -> d
     5:9:void report():395 -> d
     10:11:void report():396:397 -> d
-com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.c10:
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.y10:
     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.b10:
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.x10:
     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.d10:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.z10:
     long used -> a
     1:2:void <init>(long):96:97 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.e10:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.A10:
     java.util.Map children -> c
     long start_time -> e
     java.lang.String title -> a
@@ -130225,7 +131386,7 @@
     4:4:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):25 -> toString
     4:4:java.lang.String toString():151 -> toString
     5:5:java.lang.String toString():151:151 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.h10:
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.D10:
     boolean $assertionsDisabled -> e
     com.android.tools.r8.utils.Timing$Node slowest -> d
     int taskCount -> c
@@ -130241,7 +131402,7 @@
     24:24:com.android.tools.r8.utils.Timing$Node lambda$add$0(boolean,java.lang.String):300:300 -> a
     25:26:void end():310:311 -> a
     1:1:int access$900(com.android.tools.r8.utils.Timing$TimingMerger):220:220 -> b
-com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.f10:
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.B10:
     boolean $assertionsDisabled -> k
     int val$numberOfThreads -> i
     com.android.tools.r8.utils.Timing$TimingMerger this$0 -> j
@@ -130300,11 +131461,11 @@
     268:268:java.lang.String toString():265:265 -> toString
     269:269:java.lang.String toString():265:265 -> toString
     266:266:java.lang.String toString():265:265 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.g10:
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.C10:
     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):274:276 -> <init>
-com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.E10:
+com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.a20:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():11:11 -> <init>
@@ -130321,7 +131482,7 @@
     1:1:com.android.tools.r8.utils.TraversalContinuation$Continue doContinue():134:134 -> d
     boolean isBreak() -> e
     boolean isContinue() -> f
-com.android.tools.r8.utils.TraversalContinuation$Break -> com.android.tools.r8.internal.B10:
+com.android.tools.r8.utils.TraversalContinuation$Break -> com.android.tools.r8.internal.X10:
     com.android.tools.r8.utils.TraversalContinuation$Break BREAK_NO_VALUE -> c
     java.lang.Object value -> b
     1:1:void <clinit>():80:80 -> <clinit>
@@ -130331,10 +131492,10 @@
     boolean isBreak() -> e
     1:1:com.android.tools.r8.utils.TraversalContinuation$Break access$300():79:79 -> g
     1:1:java.lang.Object getValue():101:101 -> h
-com.android.tools.r8.utils.TraversalContinuation$Break$1 -> com.android.tools.r8.internal.A10:
+com.android.tools.r8.utils.TraversalContinuation$Break$1 -> com.android.tools.r8.internal.W10:
     1:1:void <init>(java.lang.Object):81:81 -> <init>
     1:1:java.lang.Object getValue():84:84 -> h
-com.android.tools.r8.utils.TraversalContinuation$Continue -> com.android.tools.r8.internal.D10:
+com.android.tools.r8.utils.TraversalContinuation$Continue -> com.android.tools.r8.internal.Z10:
     java.lang.Object value -> b
     com.android.tools.r8.utils.TraversalContinuation$Continue CONTINUE_NO_VALUE -> c
     1:1:void <clinit>():40:40 -> <clinit>
@@ -130345,19 +131506,19 @@
     1:1:com.android.tools.r8.utils.TraversalContinuation$Continue access$200():39:39 -> g
     1:1:java.lang.Object getValue():61:61 -> h
     1:1:java.lang.Object getValueOrDefault(java.lang.Object):65:65 -> i
-com.android.tools.r8.utils.TraversalContinuation$Continue$1 -> com.android.tools.r8.internal.C10:
+com.android.tools.r8.utils.TraversalContinuation$Continue$1 -> com.android.tools.r8.internal.Y10:
     1:1:void <init>(java.lang.Object):41:41 -> <init>
     1:1:java.lang.Object getValue():44:44 -> h
     java.lang.Object getValueOrDefault(java.lang.Object) -> i
-com.android.tools.r8.utils.TraversalUtils -> com.android.tools.r8.internal.F10:
+com.android.tools.r8.utils.TraversalUtils -> com.android.tools.r8.internal.b20:
     1:5:com.android.tools.r8.utils.TraversalContinuation traverseIterable(java.lang.Iterable,java.util.function.BiFunction,java.lang.Object):47:51 -> a
-com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.K10:
+com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.g20:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.L10:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.h20:
     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.M10:
+com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.i20:
     boolean test(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.T20:
+com.android.tools.r8.utils.TypeReferenceUtils -> com.android.tools.r8.internal.p30:
     boolean $assertionsDisabled -> b
     java.util.Comparator COMPARATOR -> a
     1:3:void <clinit>():19:21 -> <clinit>
@@ -130382,7 +131543,7 @@
     153:153:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):95:95 -> b
     154:177:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):93:116 -> b
     178:183:com.android.tools.r8.graph.DexType toDexType(com.android.tools.r8.references.TypeReference,com.android.tools.r8.graph.DexItemFactory,java.util.function.Function):114:119 -> b
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.p40:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.L40:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> c
     java.lang.String sha -> a
     java.lang.String releaser -> b
@@ -130410,7 +131571,7 @@
     1:1: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.c50:
+com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.y50:
     com.android.tools.r8.utils.Visibility PACKAGE_PRIVATE -> e
     com.android.tools.r8.utils.Visibility[] $VALUES -> f
     com.android.tools.r8.utils.Visibility PUBLIC -> b
@@ -130425,10 +131586,10 @@
     17:17:java.lang.String toString():41:41 -> toString
     18:18:java.lang.String toString():38:38 -> toString
     19:19:java.lang.String toString():35:35 -> toString
-com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.internal.b50:
+com.android.tools.r8.utils.Visibility$1 -> com.android.tools.r8.internal.x50:
     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.w50:
+com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.S50:
     java.util.Deque workingList -> a
     java.util.Set seen -> b
     boolean $assertionsDisabled -> c
@@ -130531,10 +131692,10 @@
     23:26:com.android.tools.r8.utils.ZipUtils$ZipBuilder addText(java.lang.String,java.lang.String):285:288 -> a
     27:28:java.nio.file.Path build():293:294 -> a
     1:1:java.util.zip.ZipOutputStream getOutputStream():251:251 -> b
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector -> com.android.tools.r8.internal.BG:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector -> com.android.tools.r8.internal.IG:
     1:31:com.android.tools.r8.utils.collections.ProgramMethodSet findAllMethodsAndOverridesThatMatches(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,java.util.Collection,java.util.function.Predicate):36:66 -> a
     32:36:void lambda$findAllMethodsAndOverridesThatMatches$0(java.util.function.Predicate,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):42:46 -> a
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$InterfaceMethodToClassSiblingPropagator -> com.android.tools.r8.internal.zG:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$InterfaceMethodToClassSiblingPropagator -> com.android.tools.r8.internal.GG:
     com.android.tools.r8.utils.collections.ProgramMethodSet classRootMethods -> f
     java.util.Map interfaceMethodsOfInterest -> g
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):81:81 -> <init>
@@ -130551,7 +131712,7 @@
     10:10:void visit(com.android.tools.r8.graph.DexProgramClass):97 -> k
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     11:32:void visit(com.android.tools.r8.graph.DexProgramClass):105:126 -> k
-com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$TopDownClassHierarchyPropagator -> com.android.tools.r8.internal.AG:
+com.android.tools.r8.utils.classhierarchy.MethodOverridesCollector$TopDownClassHierarchyPropagator -> com.android.tools.r8.internal.HG:
     com.android.tools.r8.utils.collections.ProgramMethodSet result -> g
     java.util.Map methodsOfInterest -> f
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ImmediateProgramSubtypingInfo,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.utils.collections.ProgramMethodSet):164:164 -> <init>
@@ -130570,12 +131731,12 @@
     7:7:void visit(com.android.tools.r8.graph.DexProgramClass):185 -> k
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:void visit(com.android.tools.r8.graph.DexProgramClass):190:190 -> k
-com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.X4:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyMap -> com.android.tools.r8.internal.Z4:
     java.util.Set getKeys(java.lang.Object) -> c
-com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.Y4:
+com.android.tools.r8.utils.collections.BidirectionalManyToManyRepresentativeMap -> com.android.tools.r8.internal.a5:
     java.lang.Object getRepresentativeValue(java.lang.Object) -> a
     java.lang.Object getRepresentativeKey(java.lang.Object) -> b
-com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.Z4:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneHashMap -> com.android.tools.r8.internal.b5:
     java.util.Map backing -> b
     java.util.Map inverse -> c
     boolean $assertionsDisabled -> d
@@ -130596,17 +131757,17 @@
     1:1:java.util.Set lambda$put$1(java.lang.Object):141:141 -> d
     1:6:java.lang.Object remove(java.lang.Object):108:113 -> e
     1:1:void forEach(java.util.function.BiConsumer):52:52 -> forEach
-    1:1:java.util.Map getForwardMap():82:82 -> g
     1:1:java.lang.Object get(java.lang.Object):72:72 -> get
     1:1:java.lang.Object getOrDefault(java.lang.Object,java.lang.Object):77:77 -> getOrDefault
+    1:1:java.util.Map getForwardMap():82:82 -> h
     1:1:boolean isEmpty():103:103 -> isEmpty
     1:1:java.util.Set keySet():87:87 -> keySet
     1:3:java.lang.Object put(java.lang.Object,java.lang.Object):139:141 -> put
     1:1:java.util.Set values():152:152 -> values
-com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.a5:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.c5:
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
-    java.util.Map getForwardMap() -> g
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.b5:
+    java.util.Map getForwardMap() -> h
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap -> com.android.tools.r8.internal.d5:
     boolean $assertionsDisabled -> f
     java.util.Map representatives -> e
     1:1:void <clinit>():13:13 -> <clinit>
@@ -130635,8 +131796,8 @@
     4:4:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):44:44 -> e
     4:4:java.lang.Object remove(java.lang.Object):99 -> e
     1:1:boolean hasExplicitRepresentativeKey(java.lang.Object):54:54 -> f
-com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.c5:
-com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.d5:
+com.android.tools.r8.utils.collections.BidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.e5:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyHashMap -> com.android.tools.r8.internal.f5:
     java.util.Map backing -> b
     java.util.Map inverse -> c
     1:1:void <init>():21:21 -> <init>
@@ -130654,7 +131815,7 @@
     1:1:java.util.Set lambda$put$2(java.lang.Object):139:139 -> f
     1:1:void forEach(java.util.function.BiConsumer):47:47 -> forEach
     1:6:java.lang.Object removeValue(java.lang.Object):125:130 -> g
-com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.e5:
+com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap -> com.android.tools.r8.internal.g5:
     java.util.Map representatives -> d
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():12:12 -> <clinit>
@@ -130665,7 +131826,7 @@
     1:2:java.lang.Object removeValue(java.lang.Object):64:65 -> g
     3:3:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToManyRepresentativeHashMap.removeRepresentativeFor(java.lang.Object):59:59 -> g
     3:3:java.lang.Object removeValue(java.lang.Object):66 -> g
-com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.f5:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap -> com.android.tools.r8.internal.h5:
     com.android.tools.r8.com.google.common.collect.BiMap backing -> b
     1:1:void <init>():22:22 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.BiMap):25:26 -> <init>
@@ -130689,11 +131850,11 @@
     1:1:boolean containsValue(java.lang.Object):41:41 -> containsValue
     1:1:java.util.Set entrySet():46:46 -> entrySet
     1:1:void forEach(java.util.function.BiConsumer):51:51 -> forEach
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.getForwardMap():92:92 -> g
-    1:1:java.util.Map getForwardMap():16 -> g
     1:1:java.lang.Object get(java.lang.Object):76:76 -> get
     1:1:java.lang.Object com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.get(java.lang.Object):76:76 -> getOrDefault
     1:1:java.lang.Object getOrDefault(java.lang.Object,java.lang.Object):81 -> getOrDefault
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.getForwardMap():92:92 -> h
+    1:1:java.util.Map getForwardMap():16 -> h
     1:1:boolean isEmpty():134:134 -> isEmpty
     1:1:java.util.Set keySet():139:139 -> keySet
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):144:144 -> put
@@ -130703,8 +131864,8 @@
     1:1:java.util.Set com.android.tools.r8.utils.collections.BidirectionalOneToOneHashMap.values():169:169 -> values
     1:1:java.util.Collection values():16 -> values
     2:2:java.util.Set values():169:169 -> values
-com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.g5:
-com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.Wg:
+com.android.tools.r8.utils.collections.BidirectionalOneToOneMap -> com.android.tools.r8.internal.i5:
+com.android.tools.r8.utils.collections.DexClassAndMethodSetBase -> com.android.tools.r8.internal.ah:
     java.util.function.Supplier backingFactory -> c
     java.util.Map backing -> b
     boolean $assertionsDisabled -> d
@@ -130739,7 +131900,7 @@
     1:1:java.util.stream.Stream stream():147:147 -> stream
     1:1:java.lang.Object[] toArray():152:152 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):157:157 -> toArray
-com.android.tools.r8.utils.collections.DexMethodSignatureMap -> com.android.tools.r8.internal.Fh:
+com.android.tools.r8.utils.collections.DexMethodSignatureMap -> com.android.tools.r8.internal.Jh:
     java.util.Map backing -> b
     1:2:void <init>(java.util.Map):24:25 -> <init>
     1:1:java.lang.Object merge(com.android.tools.r8.graph.DexEncodedMethod,java.lang.Object,java.util.function.BiFunction):144:144 -> a
@@ -130769,9 +131930,9 @@
     1:1:boolean containsValue(java.lang.Object):154:154 -> containsValue
     1:1:java.util.Set entrySet():66:66 -> entrySet
     1:1:void forEach(java.util.function.BiConsumer):76:76 -> forEach
-    1:1:com.android.tools.r8.utils.collections.DexMethodSignatureMap create():29:29 -> g
     1:1:java.lang.Object get(java.lang.Object):159:159 -> get
     1:1:java.lang.Object getOrDefault(java.lang.Object,java.lang.Object):71:71 -> getOrDefault
+    1:1:com.android.tools.r8.utils.collections.DexMethodSignatureMap create():29:29 -> h
     1:1:boolean isEmpty():187:187 -> isEmpty
     1:1:java.util.Set keySet():56:56 -> keySet
     1:1:java.lang.Object merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction):20:20 -> merge
@@ -130794,7 +131955,7 @@
     1:1:void replaceAll(java.util.function.BiFunction):81:81 -> replaceAll
     1:1:int size():208:208 -> size
     1:1:java.util.Collection values():61:61 -> values
-com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.Gh:
+com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.Kh:
     com.android.tools.r8.utils.collections.DexMethodSignatureSet EMPTY -> c
     java.util.Set backing -> b
     1:2:void <clinit>():23:24 -> <clinit>
@@ -130846,17 +132007,17 @@
     1:1:int size():167:167 -> size
     1:1:java.lang.Object[] toArray():172:172 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):177:177 -> toArray
-com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.ti:
+com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap -> com.android.tools.r8.internal.xi:
     1:1:void <init>():15:15 -> <init>
     void forEachManyToOneMapping(java.util.function.BiConsumer) -> a
     java.lang.Object getRepresentativeValue(java.lang.Object) -> a
     java.lang.Object getRepresentativeKey(java.lang.Object) -> b
     1:1:java.util.Set getKeys(java.lang.Object):92:92 -> c
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap.getForwardMap():72:72 -> g
-    1:1:java.util.Map getForwardMap():15 -> g
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.utils.collections.EmptyBidirectionalOneToOneMap.getForwardMap():72:72 -> h
+    1:1:java.util.Map getForwardMap():15 -> h
     1:1:java.util.Set keySet():107:107 -> keySet
     1:1:java.util.Set values():112:112 -> values
-com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.tools.r8.internal.Ho:
+com.android.tools.r8.utils.collections.IdentityHashSetFromMap -> com.android.tools.r8.internal.Mo:
     java.util.Map backing -> b
     java.util.function.Function valueToKeyMapping -> c
     1:1:void <init>(java.util.function.Function):21:21 -> <init>
@@ -130876,7 +132037,7 @@
     1:1:int size():31:31 -> size
     1:1:java.lang.Object[] toArray():52:52 -> toArray
     2:2:java.lang.Object[] toArray(java.lang.Object[]):57:57 -> toArray
-com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.Ro:
+com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.Wo:
     boolean isClosed -> b
     1:1:void <init>(java.util.Collection):20:20 -> <init>
     2:2:void <init>(java.util.Collection):17:17 -> <init>
@@ -130900,7 +132061,7 @@
     1:1:boolean removeIf(java.util.function.Predicate):73:73 -> removeIf
     1:1:java.lang.Object removeLast():83:83 -> removeLast
     1:1:boolean removeLastOccurrence(java.lang.Object):78:78 -> removeLastOccurrence
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.Wo:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.bp:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> c
     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>
@@ -130932,11 +132093,11 @@
     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.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.entrySet():85:85 -> g
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():17 -> g
     1:1:java.lang.Object get(int):57:57 -> get
     2:2:java.lang.Object get(java.lang.Object):62:62 -> get
     1:1:java.lang.Object getOrDefault(java.lang.Object,java.lang.Object):67:67 -> getOrDefault
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.entrySet():85:85 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():17 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):17:17 -> headMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.headMap(java.lang.Integer):129:129 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):17 -> headMap
@@ -130964,17 +132125,17 @@
     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$Builder -> com.android.tools.r8.internal.Vo:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.ap:
     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.LinkedProgramMethodSet -> com.android.tools.r8.internal.ID:
+com.android.tools.r8.utils.collections.LinkedProgramMethodSet -> com.android.tools.r8.internal.PD:
     1:1:void <init>():12:12 -> <init>
     2:2:void <init>(int):16:16 -> <init>
     1:1:java.util.LinkedHashMap createBacking():20:20 -> g
     1:1:java.util.LinkedHashMap createBacking(int):24:24 -> j
-com.android.tools.r8.utils.collections.LongLivedClassSetBuilder -> com.android.tools.r8.internal.JE:
+com.android.tools.r8.utils.collections.LongLivedClassSetBuilder -> com.android.tools.r8.internal.QE:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):23:23 -> <init>
@@ -130995,7 +132156,7 @@
     87:87:java.util.Set build(com.android.tools.r8.graph.AppView):70:70 -> a
     88:88:java.util.Set build(com.android.tools.r8.graph.AppView):70:70 -> a
     85:85:java.util.Set build(com.android.tools.r8.graph.AppView):70:70 -> a
-com.android.tools.r8.utils.collections.LongLivedCollectionBuilder -> com.android.tools.r8.internal.KE:
+com.android.tools.r8.utils.collections.LongLivedCollectionBuilder -> com.android.tools.r8.internal.RE:
     java.util.function.IntFunction factoryForBuilder -> b
     java.lang.Object backing -> d
     boolean $assertionsDisabled -> e
@@ -131003,7 +132164,7 @@
     com.android.tools.r8.graph.GraphLens appliedGraphLens -> c
     1:1:void <clinit>():10:10 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):27:31 -> <init>
-com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder -> com.android.tools.r8.internal.LE:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodMapBuilder -> com.android.tools.r8.internal.SE:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.GraphLens,java.util.function.IntFunction,java.util.function.IntFunction):30:30 -> <init>
@@ -131030,7 +132191,7 @@
     32:32:com.android.tools.r8.utils.collections.ProgramMethodMap build(com.android.tools.r8.graph.AppView,java.util.function.Function):92 -> a
     33:34:com.android.tools.r8.utils.collections.ProgramMethodMap build(com.android.tools.r8.graph.AppView,java.util.function.Function):94:95 -> a
     35:40:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMap,java.util.function.Function,com.android.tools.r8.graph.DexMethod,java.lang.Object):97:102 -> a
-com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.ME:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.TE:
     java.util.function.IntFunction factoryForBuilder -> b
     java.util.Set methods -> d
     boolean $assertionsDisabled -> e
@@ -131085,18 +132246,18 @@
     1:13:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder rewrittenWithLens(com.android.tools.r8.graph.GraphLens):147:159 -> c
     1:4:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.GraphLens):184:187 -> d
     5:5:boolean verifyIsRewrittenWithNewerLens(com.android.tools.r8.graph.GraphLens):186:186 -> d
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.cI:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneMap -> com.android.tools.r8.internal.jI:
     void put(java.lang.Iterable,java.lang.Object) -> a
-com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.dI:
-com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.eI:
-com.android.tools.r8.utils.collections.ProgramFieldMap -> com.android.tools.r8.internal.eP:
+com.android.tools.r8.utils.collections.MutableBidirectionalManyToOneRepresentativeMap -> com.android.tools.r8.internal.kI:
+com.android.tools.r8.utils.collections.MutableBidirectionalOneToManyRepresentativeMap -> com.android.tools.r8.internal.lI:
+com.android.tools.r8.utils.collections.ProgramFieldMap -> com.android.tools.r8.internal.wP:
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):20:20 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramFieldMap create():24:24 -> b
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMember):15:15 -> d
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.utils.collections.ProgramFieldMap.wrap(com.android.tools.r8.graph.ProgramField):34:34 -> d
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMember):15 -> d
-com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.fP:
+com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.xP:
     java.util.Map backing -> b
     com.android.tools.r8.utils.collections.ProgramFieldSet EMPTY -> c
     boolean $assertionsDisabled -> d
@@ -131110,7 +132271,7 @@
     1:1:com.android.tools.r8.utils.collections.ProgramFieldSet empty():34:34 -> b
     2:2:boolean contains(com.android.tools.r8.graph.ProgramField):60:60 -> b
     1:1:java.util.Iterator iterator():73:73 -> iterator
-com.android.tools.r8.utils.collections.ProgramMemberMap -> com.android.tools.r8.internal.hP:
+com.android.tools.r8.utils.collections.ProgramMemberMap -> com.android.tools.r8.internal.zP:
     java.util.Map backing -> a
     1:2:void <init>(java.util.function.Supplier):20:21 -> <init>
     3:4:void <init>(java.util.Map):24:25 -> <init>
@@ -131129,7 +132290,7 @@
     1:1:java.lang.Object get(com.android.tools.r8.graph.ProgramMember):49:49 -> b
     1:1:java.lang.Object remove(com.android.tools.r8.graph.ProgramMember):71:71 -> c
     com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMember) -> d
-com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.jP:
+com.android.tools.r8.utils.collections.ProgramMethodMap -> com.android.tools.r8.internal.BP:
     com.android.tools.r8.utils.collections.ProgramMethodMap EMPTY -> b
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):21:21 -> <init>
@@ -131141,7 +132302,7 @@
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.utils.collections.ProgramMethodMap.wrap(com.android.tools.r8.graph.ProgramMethod):47:47 -> d
     2:2:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(com.android.tools.r8.graph.ProgramMember):16 -> d
     3:3:com.android.tools.r8.utils.collections.ProgramMethodMap empty():42:42 -> d
-com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.kP:
+com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.CP:
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):22:23 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMultiset createConcurrent():27:27 -> a
@@ -131154,7 +132315,7 @@
     7:7:boolean lambda$removeIf$1(java.util.function.Predicate,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):47:47 -> a
     8:8:boolean removeIf(java.util.function.Predicate):47:47 -> a
     1:1:int size():51:51 -> b
-com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.lP:
+com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.DP:
     com.android.tools.r8.utils.collections.ProgramMethodSet EMPTY -> e
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):25:25 -> <init>
@@ -131183,7 +132344,7 @@
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet empty():73:73 -> f
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet create(int):39:39 -> h
     1:1:com.android.tools.r8.utils.collections.LinkedProgramMethodSet createLinked(int):69:69 -> i
-com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.PX:
+com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.kY:
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.util.function.Supplier):29:29 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):23:23 -> a
@@ -131205,7 +132366,7 @@
     1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet create():33:33 -> g
     1:1:java.util.SortedMap lambda$create$1():44:44 -> h
     1:1:java.util.SortedMap lambda$static$0():26:26 -> i
-com.android.tools.r8.utils.dfs.DFSStack -> com.android.tools.r8.internal.Ke:
+com.android.tools.r8.utils.dfs.DFSStack -> com.android.tools.r8.internal.Oe:
     java.util.Deque stack -> a
     java.util.Set stackSet -> b
     boolean $assertionsDisabled -> c
@@ -131231,21 +132392,21 @@
     1:5:java.util.Deque getCycleStartingAt(java.lang.Object):32:36 -> b
     6:8:void com.android.tools.r8.utils.dfs.DFSStack.recoverStack(java.util.Deque):64:66 -> b
     6:8:java.util.Deque getCycleStartingAt(java.lang.Object):37 -> b
-com.android.tools.r8.utils.dfs.DFSWorklistItem -> com.android.tools.r8.internal.Ne:
+com.android.tools.r8.utils.dfs.DFSWorklistItem -> com.android.tools.r8.internal.Re:
     java.lang.Object value -> a
     1:2:void <init>(java.lang.Object):11:12 -> <init>
     com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem asNewlyVisited() -> a
     1:1:java.lang.Object getValue():16:16 -> b
-com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem -> com.android.tools.r8.internal.Le:
+com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem -> com.android.tools.r8.internal.Pe:
     1:1:void <init>(java.lang.Object):55:55 -> <init>
-com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem -> com.android.tools.r8.internal.Me:
+com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem -> com.android.tools.r8.internal.Qe:
     1:1:void <init>(java.lang.Object):34:34 -> <init>
     com.android.tools.r8.utils.dfs.DFSWorklistItem$NewlyVisitedDFSWorklistItem asNewlyVisited() -> a
     1:1:com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem toFullyVisited():48:48 -> c
     2:2:java.lang.Object com.android.tools.r8.utils.dfs.DFSWorklistItem.getValue():16:16 -> c
     2:2:com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem toFullyVisited():48 -> c
     3:3:com.android.tools.r8.utils.dfs.DFSWorklistItem$FullyVisitedDFSWorklistItem toFullyVisited():48:48 -> c
-com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.Gc:
+com.android.tools.r8.utils.structural.CompareToVisitor -> com.android.tools.r8.internal.Jc:
     1:1:void <init>():18:18 -> <init>
     int visit(java.lang.Object,java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping) -> a
     int visitBool(boolean,boolean) -> a
@@ -131260,7 +132421,7 @@
     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.Ic:
+com.android.tools.r8.utils.structural.CompareToVisitorBase -> com.android.tools.r8.internal.Lc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>():19:19 -> <init>
@@ -131281,7 +132442,7 @@
     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$ItemSpecification -> com.android.tools.r8.internal.Hc:
+com.android.tools.r8.utils.structural.CompareToVisitorBase$ItemSpecification -> com.android.tools.r8.internal.Kc:
     com.android.tools.r8.utils.structural.CompareToVisitorBase parent -> a
     java.lang.Object item1 -> b
     boolean $assertionsDisabled -> e
@@ -131351,17 +132512,17 @@
     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.Jc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithNamingLens -> com.android.tools.r8.internal.Mc:
     com.android.tools.r8.naming.NamingLens namingLens -> b
     1:2:void <init>(com.android.tools.r8.naming.NamingLens):29:30 -> <init>
     1:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):38:41 -> a
-    5:5:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
+    5:5:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):69:69 -> a
     5:5:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):41 -> a
     6:6:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):49:49 -> a
     7:7:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> a
     7:7:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):49 -> a
     8:8:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):53:53 -> a
-    9:9:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
+    9:9:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):69:69 -> a
     9:9:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):53 -> a
     10:10:int visitDexField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):57:57 -> a
     11:11:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> a
@@ -131370,43 +132531,43 @@
     13:13:int com.android.tools.r8.graph.DexType.acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> a
     13:13:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):65 -> a
     14:14:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):69:69 -> a
-    15:15:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
+    15:15:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):69:69 -> a
     15:15:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):69 -> a
     16:16:int visitDexMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):73:73 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.Kc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithStringTable -> com.android.tools.r8.internal.Nc:
     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):25:25 -> a
     2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
     2:2:int visitDexString(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):25 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.Lc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeEquivalence -> com.android.tools.r8.internal.Oc:
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:2:void <init>(com.android.tools.r8.utils.structural.RepresentativeMap):26:27 -> <init>
     1:3:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):35:37 -> a
-    4:4:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):65:65 -> a
+    4:4:int com.android.tools.r8.graph.DexString.acceptCompareTo(com.android.tools.r8.graph.DexString,com.android.tools.r8.utils.structural.CompareToVisitor):69:69 -> a
     4:4:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):37 -> a
-com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.Mc:
+com.android.tools.r8.utils.structural.CompareToVisitorWithTypeTable -> com.android.tools.r8.internal.Pc:
     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):28:28 -> a
     2:2:int com.android.tools.r8.utils.structural.CompareToVisitorBase.visitInt(int,int):38:38 -> a
     2:2:int visitDexType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):28 -> a
-com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.pf:
+com.android.tools.r8.utils.structural.DefaultCompareToVisitor -> com.android.tools.r8.internal.tf:
     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):20:21 -> 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.rf:
+com.android.tools.r8.utils.structural.DefaultHashingVisitor -> com.android.tools.r8.internal.vf:
     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.utils.structural.HasherWrapper,com.android.tools.r8.utils.structural.StructuralItem$HashingAccept):21:21 -> a
-com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.Jj:
+com.android.tools.r8.utils.structural.Equatable -> com.android.tools.r8.internal.Oj:
     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.Ij:
+com.android.tools.r8.utils.structural.Equatable$1 -> com.android.tools.r8.internal.Nj:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
-com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.rn:
+com.android.tools.r8.utils.structural.HashCodeVisitor -> com.android.tools.r8.internal.wn:
     int $r8$clinit -> d
     java.lang.Object item -> a
     int hashCode -> b
@@ -131435,7 +132596,7 @@
     3: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):25 -> 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
-com.android.tools.r8.utils.structural.HasherWrapper -> com.android.tools.r8.internal.xn:
+com.android.tools.r8.utils.structural.HasherWrapper -> com.android.tools.r8.internal.Cn:
     java.lang.String hashCodeAsString() -> a
     void putBoolean(boolean) -> a
     void putBytes(byte[]) -> a
@@ -131444,7 +132605,7 @@
     void putInt(int) -> a
     void putLong(long) -> a
     1:1:com.android.tools.r8.utils.structural.HasherWrapper sha256Hasher():33:33 -> b
-com.android.tools.r8.utils.structural.HasherWrapper$HasherWrapped -> com.android.tools.r8.internal.wn:
+com.android.tools.r8.utils.structural.HasherWrapper$HasherWrapped -> com.android.tools.r8.internal.Bn:
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.hash.Hasher):44:45 -> <init>
     1:1:void putBoolean(boolean):50:50 -> a
@@ -131455,7 +132616,7 @@
     6:6:void putBytes(byte[]):75:75 -> a
     7:7:java.lang.String hashCodeAsString():86:86 -> a
     1:1:java.lang.Object hash():81:81 -> c
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.Cn:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence -> com.android.tools.r8.internal.Hn:
     com.android.tools.r8.utils.structural.HasherWrapper hash -> a
     com.android.tools.r8.utils.structural.RepresentativeMap representatives -> b
     1:1:void com.android.tools.r8.utils.structural.HashingVisitor.<init>():16:16 -> <init>
@@ -131485,7 +132646,7 @@
     14:14:void visitDexType(com.android.tools.r8.graph.DexType):71:71 -> a
     15:15:void visit(java.lang.Object,com.android.tools.r8.utils.structural.StructuralMapping):76:76 -> a
     1:1:void com.android.tools.r8.utils.structural.HashingVisitor.visitDexReference(com.android.tools.r8.graph.DexReference):52:52 -> b
-com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.Bn:
+com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification -> com.android.tools.r8.internal.Gn:
     java.lang.Object item -> b
     com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence parent -> a
     boolean $assertionsDisabled -> c
@@ -131514,7 +132675,7 @@
     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):86 -> b
     1:3:com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification com.android.tools.r8.utils.structural.HashingVisitorWithTypeEquivalence$ItemSpecification.withShortArray(java.util.function.Function):143:145 -> i
     1:3:com.android.tools.r8.utils.structural.StructuralSpecification withShortArray(java.util.function.Function):86 -> i
-com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.YM:
+com.android.tools.r8.utils.structural.Ordered -> com.android.tools.r8.internal.pN:
     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 maxIgnoreNull(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):45:45 -> a
@@ -131526,13 +132687,13 @@
     2:2:boolean isLessThan(java.lang.Object):49:49 -> c
     1:1: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.XM:
+com.android.tools.r8.utils.structural.Ordered$1 -> com.android.tools.r8.internal.oN:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
-com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.cV:
+com.android.tools.r8.utils.structural.RepresentativeMap -> com.android.tools.r8.internal.xV:
     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.SZ:
-com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.VZ:
+com.android.tools.r8.utils.structural.StructuralAcceptor -> com.android.tools.r8.internal.n00:
+com.android.tools.r8.utils.structural.StructuralItem -> com.android.tools.r8.internal.q00:
     com.android.tools.r8.utils.structural.StructuralItem self() -> E
     1:1:int compareTo(com.android.tools.r8.utils.structural.StructuralItem):28:28 -> a
     2:2:int compareWithTypeEquivalenceTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.RepresentativeMap):39:39 -> a
@@ -131544,13 +132705,13 @@
     8:8:void acceptHashing(com.android.tools.r8.utils.structural.HashingVisitor):76:76 -> a
     1:1:int compareTo(java.lang.Object):7:7 -> compareTo
     com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping() -> m
-com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.TZ:
+com.android.tools.r8.utils.structural.StructuralItem$CompareToAccept -> com.android.tools.r8.internal.o00:
     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.UZ:
+com.android.tools.r8.utils.structural.StructuralItem$HashingAccept -> com.android.tools.r8.internal.p00:
     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.WZ:
+com.android.tools.r8.utils.structural.StructuralMapping -> com.android.tools.r8.internal.r00:
     void apply(com.android.tools.r8.utils.structural.StructuralSpecification) -> a
-com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.XZ:
+com.android.tools.r8.utils.structural.StructuralSpecification -> com.android.tools.r8.internal.s00:
     1:1:void <init>():18:18 -> <init>
     boolean lambda$withCustomItem$0(java.lang.Object) -> a
     com.android.tools.r8.utils.structural.StructuralSpecification self() -> a
@@ -131580,13 +132741,13 @@
     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
-com.android.tools.r8.verticalclassmerging.EmptyInterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.Bi:
+com.android.tools.r8.verticalclassmerging.EmptyInterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.Fi:
     1:1:void <init>():16:16 -> <init>
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void processWorklist() -> a
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.ov:
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelper -> com.android.tools.r8.internal.uv:
     1:1:void <init>():40:40 -> <init>
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
     void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator) -> a
@@ -131599,7 +132760,7 @@
     7:7:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):48:48 -> a
     8:8:boolean com.android.tools.r8.graph.GraphLens.isVerticalClassMergerLens():0:0 -> a
     8:8:boolean lambda$create$0(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):48 -> a
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl -> com.android.tools.r8.internal.qv:
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl -> com.android.tools.r8.internal.wv:
     java.util.Map worklist -> c
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.code.IRCode code -> b
@@ -131659,7 +132820,7 @@
     125:125:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):255:255 -> a
     126:126:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):250:250 -> a
     127:127:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):245:245 -> a
-com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl$WorklistItem -> com.android.tools.r8.internal.pv:
+com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl$WorklistItem -> com.android.tools.r8.internal.vv:
     com.android.tools.r8.graph.DexType rewrittenType -> c
     com.android.tools.r8.graph.DexType originalType -> b
     int operandIndex -> a